[TASK] Base Install Tool on Bootstrap 75/44475/16
authorMathias Schreiber <mathias.schreiber@wmdb.de>
Mon, 2 Nov 2015 09:12:00 +0000 (10:12 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 6 Nov 2015 14:44:14 +0000 (15:44 +0100)
Resolves: #62067
Releases: master
Change-Id: I85ad755d6213af9f75775130022dd201799cb13e
Reviewed-on: https://review.typo3.org/44475
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
122 files changed:
Build/Gruntfile.js
Build/Resources/Public/Less/InstallTool.less [new file with mode: 0644]
typo3/sysext/install/Classes/Controller/Action/Ajax/EnvironmentStatus.php
typo3/sysext/install/Classes/Controller/Action/Step/AbstractStepAction.php
typo3/sysext/install/Classes/Controller/Action/Tool/CleanUp.php
typo3/sysext/install/Classes/Controller/Action/Tool/SystemEnvironment.php
typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
typo3/sysext/install/Classes/Status/ErrorStatus.php
typo3/sysext/install/Classes/Status/InfoStatus.php
typo3/sysext/install/Classes/Status/OkStatus.php
typo3/sysext/install/Classes/Status/StatusUtility.php
typo3/sysext/install/Classes/SystemEnvironment/Check.php
typo3/sysext/install/Resources/Private/Layouts/Step.html
typo3/sysext/install/Resources/Private/Layouts/ToolAuthenticated.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/Head.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/Headers.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/Left.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/LoginForm.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/StatusMessage.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/SubmitButton.html
typo3/sysext/install/Resources/Private/Partials/Action/Step/DatabaseConnect/ConnectDetails.html
typo3/sysext/install/Resources/Private/Partials/Action/Step/StepCounter.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/AllConfiguration/SubSection.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/CleanUp/ClearTables.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/CleanUp/ProcessedFiles.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/CleanUp/ResetBackendUserUc.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/CleanUp/Typo3TempFiles.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/CoreInternal.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/Iconv.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/Mbstring.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Debug.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Live.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apc.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Database.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/GraphicsMagick.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/ImageMagick6.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Sendmail.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/ChangeSiteName.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/ClearAllCache.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/ClearOpcodeCache.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/CoreUpdateButton.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/CreateAdministrator.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/DatabaseAnalyzerButton.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/DatabaseAnalyzerData.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/ExtensionCompatibilityTester.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/NewInstallToolPassword.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/SetNewEncryptionKey.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/ImportantActions/SystemInformation.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/AboutImageHandling.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/CombiningImages.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/ConvertImageFormatsToJpg.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/CurrentConfiguration.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/Gdlib.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/Mail.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/ScalingImages.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/TrueTypeFont.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/VerifyTestResults.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/WriteGifAndPng.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/UpgradeWizard/GetUserInput.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/UpgradeWizard/ListUpdates.html
typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html
typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolDisabled.html
typo3/sysext/install/Resources/Private/Templates/Action/Common/InstallToolPasswordNotSet.html
typo3/sysext/install/Resources/Private/Templates/Action/Common/Login.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseConnect.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseData.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DatabaseSelect.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/DefaultConfiguration.html
typo3/sysext/install/Resources/Private/Templates/Action/Step/EnvironmentAndFolders.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/About.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/AllConfiguration.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/CleanUp.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/Configuration.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/FolderStructure.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/ImportantActions.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/LoadExtensions.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/SystemEnvironment.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/TestSetup.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/UpgradeWizard.html
typo3/sysext/install/Resources/Public/Css/Action/Common/EarlyExit.css [deleted file]
typo3/sysext/install/Resources/Public/Css/Action/Common/Install.css [deleted file]
typo3/sysext/install/Resources/Public/Css/Action/Common/Login.css [deleted file]
typo3/sysext/install/Resources/Public/Css/Action/Step/General.css [deleted file]
typo3/sysext/install/Resources/Public/Css/InstallTool.css [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/Background/Body.jpg [deleted file]
typo3/sysext/install/Resources/Public/Images/Background/Content.jpg [deleted file]
typo3/sysext/install/Resources/Public/Images/Background/ContentBottom.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Background/ContentTop.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Background/Logo.gif [deleted file]
typo3/sysext/install/Resources/Public/Images/Background/Menu.gif [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/Error.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/Information.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/LoginIconKey.gif [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/Notice.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/Ok.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/Save.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/Warning.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/arrowdown-dark.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/arrowdown-white.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/arrowright-dark.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Icon/arrowright-white.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/AllConfiguration.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/CleanUp.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/Configuration.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/FolderStructure.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/ImportantActions.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/SystemEnvironment.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/TestSetup.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/UpgradeWizard.png [deleted file]
typo3/sysext/install/Resources/Public/Images/Menu/Welcome.png [deleted file]
typo3/sysext/install/Resources/Public/Images/typo3_orange.svg [new file with mode: 0644]
typo3/sysext/install/Resources/Public/JavaScript/Install.js
typo3/sysext/install/Resources/Public/JavaScript/bootstrap.min.js [new file with mode: 0644]

index c97f08c..0535843 100644 (file)
@@ -34,6 +34,7 @@ module.exports = function(grunt) {
                        root      : '../',
                        sysext    : '<%= paths.root %>typo3/sysext/',
                        t3skin    : '<%= paths.sysext %>t3skin/Resources/',
+                       install   : '<%= paths.sysext %>install/Resources/',
                        backend   : '<%= paths.sysext %>backend/Resources/',
                        core      : '<%= paths.sysext %>core/Resources/',
                        flags     : 'bower_components/region-flags/svg/',
@@ -48,6 +49,15 @@ module.exports = function(grunt) {
                                files: {
                                        "<%= paths.t3skin %>Public/Css/backend.css": "<%= paths.less %>backend.less"
                                }
+                       },
+                       InstallTool: {
+                               options: {
+                                       banner: '<%= banner %>',
+                                       outputSourceFiles: true
+                               },
+                               files: {
+                                       "<%= paths.install %>Public/Css/InstallTool.css": "<%= paths.less %>InstallTool.less"
+                               }
                        }
                },
                postcss: {
diff --git a/Build/Resources/Public/Less/InstallTool.less b/Build/Resources/Public/Less/InstallTool.less
new file mode 100644 (file)
index 0000000..74b67a3
--- /dev/null
@@ -0,0 +1,144 @@
+//
+// Install Tool
+// =========
+// Contains all needed styles for the TYPO3 Intall Tool.
+//
+
+
+//
+// Load minimal Setup including variables
+//
+@import "_minimal.less";
+
+//
+// Load global Variables
+// Note: Needs to be loaded always at the end of the LESS file that gets compiled
+//
+@import "_variables.less";
+
+.content-area > h3 {
+       margin-top: 0;
+}
+
+.logo-pageheader {
+       display: table-cell;
+       vertical-align: bottom;
+       line-height:0;
+       img {
+               padding-bottom: 1px;
+       }
+}
+
+img.logo {
+       vertical-align: bottom;
+}
+
+.typo3-message > h4 {
+       margin-bottom: 0;
+}
+
+.typo3-message p {
+       margin-top: 9px;
+}
+
+@alert-success-text: @gray-darker;
+@alert-success-border: #79a548;
+@alert-success-bg: lighten(#79a548, 20%);
+
+@alert-info-text: @gray-darker;
+@alert-info-border: #6daae0;
+@alert-info-bg: lighten(#6daae0, 20%);
+
+@alert-warning-text: @gray-darker;
+@alert-warning-border: #e8a33d;
+@alert-warning-bg: lighten(#e8a33d, 20%);
+
+@alert-danger-text: @gray-darker;
+@alert-danger-border: #c83c3c;
+@alert-danger-bg: lighten(#c83c3c, 30%);
+
+.alert-notice {
+       .alert-variant(@btn-default-bg; @btn-default-border; @btn-default-color);
+}
+
+table.t3-install-displaytwinimageimages tr > td {
+       padding-right: 20px;
+}
+
+.nav-pills > li > a {
+       border-radius: 0;
+}
+
+h1:first-child {
+       margin-top: 0;
+}
+
+.typo3-docheader {
+       &-functions,
+       &-buttons {
+               min-height: 20px;
+       }
+}
+
+.item {
+       margin : 1em;
+       border: 1px solid @panel-default-heading-bg;
+}
+
+.item .item-heading {
+       padding: 1em;
+       background-color: @panel-default-heading-bg;
+}
+
+.item .item-body {
+       padding: 1em;
+}
+
+@media (min-width: @screen-md-min) {
+       .affix-bottom {
+               position: absolute;
+       }
+
+       body.standalone .affix-top {
+               position: relative;
+       }
+
+       .affix {
+               position: fixed;
+               top: 35px;
+       }
+
+       body.backend .affix-top {
+               position: fixed;
+               top: 35px;
+       }
+
+       body.backend .leftNavigation {
+               min-height: 425px;
+       }
+}
+
+hr {
+       border-top-color: @panel-default-heading-bg;
+}
+
+#fixed-footer-handler {
+       height: 32px;
+}
+.fixed {
+       position: fixed;
+       bottom: 0;
+       background-color: grey;
+       .footer-innerWrap {
+               padding : 1.5em;
+       }
+}
+
+// override 'position: fixed' (set by bootstrap affix via JS) if viewport < MD
+// menu is placed above the content
+#menuWrapper {
+       @media (max-width: @screen-sm-max) {
+               position: relative!important;
+               margin-bottom: 30px;
+       }
+}
\ No newline at end of file
index 8c995f5..9e3e972 100644 (file)
@@ -31,11 +31,11 @@ class EnvironmentStatus extends AbstractAjaxAction
 
         // Count of failed environment checks to be displayed in the left navigation menu
         $environmentStatus = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\Check::class)->getStatus();
-        $environmentErrors = $statusUtility->filterBySeverity($environmentStatus, 'error');
+        $environmentErrors = $statusUtility->filterBySeverity($environmentStatus, 'danger');
 
         // Count of failed database checks to be displayed in the left navigation menu
         $databaseStatus = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\DatabaseCheck::class)->getStatus();
-        $databaseErrors = $statusUtility->filterBySeverity($databaseStatus, 'error');
+        $databaseErrors = $statusUtility->filterBySeverity($databaseStatus, 'danger');
 
         return count($environmentErrors) + count($databaseErrors);
     }
index c495402..2828180 100644 (file)
@@ -81,8 +81,10 @@ abstract class AbstractStepAction extends \TYPO3\CMS\Install\Controller\Action\A
                 'number' => $i,
                 'class' => $class,
                 'total' => $totalSteps,
+                'percent' => floor((100 * $i) / $totalSteps)
             );
         }
         $this->view->assign('steps', $steps);
+        $this->view->assign('currentStep', $steps[$currentStep-1]);
     }
 }
index 2e93f54..4d80052 100644 (file)
@@ -43,12 +43,18 @@ class CleanUp extends Action\AbstractAction
     {
         if (isset($this->postValues['set']['clearTables'])) {
             $this->actionMessages[] = $this->clearSelectedTables();
+            $this->view->assign('postAction', 'clearTables');
         }
         if (isset($this->postValues['set']['resetBackendUserUc'])) {
             $this->actionMessages[] = $this->resetBackendUserUc();
+            $this->view->assign('postAction', 'resetBackendUserUc');
         }
         if (isset($this->postValues['set']['clearProcessedFiles'])) {
             $this->actionMessages[] = $this->clearProcessedFiles();
+            $this->view->assign('postAction', 'clearProcessedFiles');
+        }
+        if (isset($this->postValues['set']['deleteTypo3TempFiles'])) {
+            $this->view->assign('postAction', 'deleteTypo3TempFiles');
         }
 
         $this->view->assign('cleanableTables', $this->getCleanableTableList());
index 3be1b69..97ba761 100644 (file)
@@ -15,6 +15,9 @@ namespace TYPO3\CMS\Install\Controller\Action\Tool;
  */
 
 use TYPO3\CMS\Install\Controller\Action;
+use TYPO3\CMS\Install\Status\StatusUtility;
+use TYPO3\CMS\Install\SystemEnvironment\Check;
+use TYPO3\CMS\Install\SystemEnvironment\DatabaseCheck;
 
 /**
  * Show system environment check results
@@ -28,16 +31,16 @@ class SystemEnvironment extends Action\AbstractAction
      */
     protected function executeAction()
     {
-        /** @var $statusCheck \TYPO3\CMS\Install\SystemEnvironment\Check */
-        $statusCheck = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\Check::class);
+        /** @var $statusCheck Check */
+        $statusCheck = $this->objectManager->get(Check::class);
         $statusObjects = $statusCheck->getStatus();
 
-        /** @var $statusCheck \TYPO3\CMS\Install\SystemEnvironment\DatabaseCheck */
-        $databaseStatusCheck = $this->objectManager->get(\TYPO3\CMS\Install\SystemEnvironment\DatabaseCheck::class);
+        /** @var $statusCheck DatabaseCheck */
+        $databaseStatusCheck = $this->objectManager->get(DatabaseCheck::class);
         $statusObjects = array_merge($statusObjects, $databaseStatusCheck->getStatus());
 
-        /** @var $statusUtility \TYPO3\CMS\Install\Status\StatusUtility */
-        $statusUtility = $this->objectManager->get(\TYPO3\CMS\Install\Status\StatusUtility::class);
+        /** @var $statusUtility StatusUtility */
+        $statusUtility = $this->objectManager->get(StatusUtility::class);
         $sortedStatusObjects = $statusUtility->sortBySeverity($statusObjects);
         $this->view->assign('statusObjectsBySeverity', $sortedStatusObjects);
 
index 9c99af9..a91367a 100644 (file)
@@ -41,6 +41,7 @@ class TestSetup extends Action\AbstractAction
         $actionMessages = array();
         if (isset($this->postValues['set']['testMail'])) {
             $actionMessages[] = $this->sendTestMail();
+            $this->view->assign('postAction', 'testMail');
         }
 
         if (isset($this->postValues['set']['testTrueTypeFont'])) {
index 149c4ba..4684d90 100644 (file)
@@ -22,5 +22,5 @@ class ErrorStatus extends AbstractStatus implements StatusInterface
     /**
      * @var string The severity
      */
-    protected $severity = 'error';
+    protected $severity = 'danger';
 }
index b39e325..07397ae 100644 (file)
@@ -22,5 +22,5 @@ class InfoStatus extends AbstractStatus implements StatusInterface
     /**
      * @var string The severity
      */
-    protected $severity = 'information';
+    protected $severity = 'info';
 }
index 6159edf..044cfbe 100644 (file)
@@ -22,5 +22,5 @@ class OkStatus extends AbstractStatus implements StatusInterface
     /**
      * @var string The severity
      */
-    protected $severity = 'ok';
+    protected $severity = 'success';
 }
index 9126b89..cb11bb3 100644 (file)
@@ -31,10 +31,10 @@ class StatusUtility
     {
         $orderedStatus = array(
             'alert' => $this->filterBySeverity($statusObjects, 'alert'),
-            'error' => $this->filterBySeverity($statusObjects, 'error'),
+            'danger' => $this->filterBySeverity($statusObjects, 'danger'),
             'warning' => $this->filterBySeverity($statusObjects, 'warning'),
-            'ok' => $this->filterBySeverity($statusObjects, 'ok'),
-            'information' => $this->filterBySeverity($statusObjects, 'information'),
+            'success' => $this->filterBySeverity($statusObjects, 'success'),
+            'info' => $this->filterBySeverity($statusObjects, 'info'),
             'notice' => $this->filterBySeverity($statusObjects, 'notice'),
         );
         return $orderedStatus;
index 9a691f9..c7e528c 100644 (file)
@@ -99,8 +99,8 @@ class Check
             $statusArray[] = $this->checkSuhosinPostMaxVars();
             $statusArray[] = $this->checkSuhosinGetMaxNameLength();
             $statusArray[] = $this->checkSuhosinGetMaxValueLength();
-            $statusArray[] = $this->checkSuhosinExecutorIncludeWhitelistContainsPhar();
-            $statusArray[] = $this->checkSuhosinExecutorIncludeWhitelistContainsVfs();
+            $statusArray[] = $this->checkSuhosinExecutorIncludeWhiteListContainsPhar();
+            $statusArray[] = $this->checkSuhosinExecutorIncludeWhiteListContainsVfs();
         }
         $statusArray[] = $this->checkMaxInputVars();
         $statusArray[] = $this->checkSomePhpOpcodeCacheIsLoaded();
@@ -1127,7 +1127,6 @@ class Check
     protected function checkLocaleWithUTF8filesystem()
     {
         if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-
             // On Windows an empty local value uses the regional settings from the Control Panel
             if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale'] === '' && TYPO3_OS !== 'WIN') {
                 $status = new Status\ErrorStatus();
@@ -1171,8 +1170,7 @@ class Check
      */
     protected function checkWindowsApacheThreadStackSize()
     {
-        if (
-            $this->isWindowsOs()
+        if ($this->isWindowsOs()
             && substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'
         ) {
             $status = new Status\WarningStatus();
@@ -1255,8 +1253,7 @@ class Check
      */
     protected function checkGdLibGifSupport()
     {
-        if (
-            function_exists('imagecreatefromgif')
+        if (function_exists('imagecreatefromgif')
             && function_exists('imagegif')
             && (imagetypes() & IMG_GIF)
         ) {
@@ -1291,8 +1288,7 @@ class Check
      */
     protected function checkGdLibJpgSupport()
     {
-        if (
-            function_exists('imagecreatefromjpeg')
+        if (function_exists('imagecreatefromjpeg')
             && function_exists('imagejpeg')
             && (imagetypes() & IMG_JPG)
         ) {
@@ -1316,8 +1312,7 @@ class Check
      */
     protected function checkGdLibPngSupport()
     {
-        if (
-            function_exists('imagecreatefrompng')
+        if (function_exists('imagecreatefrompng')
             && function_exists('imagepng')
             && (imagetypes() & IMG_PNG)
         ) {
@@ -1395,15 +1390,13 @@ class Check
                 $status->setTitle('FreeType True Type Font DPI');
                 $status->setMessage('Fonts are rendered by FreeType library. ' .
                     'We need to ensure that the final dimensions are as expected. ' .
-                    'This server renderes fonts based on 96 DPI correctly'
-                );
+                    'This server renderes fonts based on 96 DPI correctly');
             } else {
                 $status = new Status\NoticeStatus();
                 $status->setTitle('FreeType True Type Font DPI');
                 $status->setMessage('Fonts are rendered by FreeType library. ' .
                     'This server does not render fonts as expected. ' .
-                    'Please check your FreeType 2 module.'
-                );
+                    'Please check your FreeType 2 module.');
             }
         } else {
             $status = new Status\ErrorStatus();
index 66446a2..44759a4 100644 (file)
@@ -2,32 +2,37 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers">
        <head>
                <title>Installing TYPO3 CMS</title>
-               <script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-2.1.4.min.js?{time}"></script>
-               <script type="text/javascript" src="../Resources/Public/JavaScript/Install.js?{time}"></script>
-               <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Step/General.css?{time}" />
+               <f:render partial="Action/Common/Headers" arguments="{_all}" />
        </head>
        <body>
-               <div id="t3-install-outer">
-                       <h1></h1>
+               <div class="container">
+                       <div class="page-header">
+                               <h1 class="logo-pageheader"><img src="../Resources/Public/Images/typo3_orange.svg" width="130" class="logo" /> <small> CMS {typo3Version}</small></h1>
+                       </div>
+                       <div class="row">
+                               <h2>Installing TYPO3 CMS <i:constant name="TYPO3_version" /></h2>
 
-                       <h2>Installing TYPO3 CMS <i:constant name="TYPO3_version" /></h2>
+                               <f:if condition="{messages}">
+                                       <div id="t3-install-step-execution-messages">
+                                               <h4>Messages</h4>
+                                               <f:for each="{messages}" as="message">
+                                                       <f:render partial="Action/Common/StatusMessage" arguments="{message: message}" />
+                                               </f:for>
+                                       </div>
+                               </f:if>
 
-                       <f:if condition="{messages}">
-                               <div id="t3-install-step-execution-messages">
-                                       <h4>Messages</h4>
-                                       <f:for each="{messages}" as="message">
-                                               <f:render partial="Action/Common/StatusMessage" arguments="{message: message}" />
-                                       </f:for>
+                               <div id="t3-install-box-body">
+                                       <f:render section="Content" />
                                </div>
-                       </f:if>
-
-                       <div id="t3-install-box-body">
-                               <f:render section="Content" />
-                       </div>
 
-                       <div id="t3-install-box-border-bottom">&nbsp;</div>
+                               <div id="t3-install-box-border-bottom">&nbsp;</div>
 
-                       <f:render partial="Action/Common/Copyright" arguments="{_all}" />
+                               <div class="panel panel-default">
+                                       <div class="panel-body">
+                                               <f:render partial="Action/Common/Copyright" arguments="{_all}" />
+                                       </div>
+                               </div>
+                       </div>
                </div>
        </body>
 </html>
index c44889a..e491ea0 100644 (file)
@@ -5,23 +5,28 @@
                <f:render partial="Action/Common/Headers" arguments="{_all}" />
        </head>
        <body class="{context}">
-       <f:if condition="{contextService.backendContext}">
-               <div id="typo3-docheader">
-                       <div class="typo3-docheader-functions"></div>
-                       <div class="typo3-docheader-buttons"></div>
-               </div>
-       </f:if>
-       <div id="typo3-docbody">
-               <div id="t3-install-outer">
-                       <f:render partial="Action/Common/Head" arguments="{_all}" />
-                       <div id="t3-install-center">
-                               <f:render partial="Action/Common/Left" arguments="{_all}" />
-                               <div id="t3-install-right">
-                                       <div id="t3-install-box-body">
-                                               <f:render section="Content" />
+       <div class="container">
+               <f:if condition="{contextService.backendContext}">
+                       <f:then>
+                               <div id="typo3-docheader">
+                                       <div class="typo3-docheader-functions"></div>
+                                       <div class="typo3-docheader-buttons"></div>
+                               </div>
+                       </f:then>
+                       <f:else>
+                               <div class="row">
+                                       <div class="col-sm-12">
+                                               <f:render partial="Action/Common/Head" arguments="{_all}" />
                                        </div>
-                                       <f:render partial="Action/Common/Copyright" arguments="{_all}" />
                                </div>
+                       </f:else>
+               </f:if>
+               <div class="row">
+                       <div class="col-sm-12 col-md-3 leftNavigation">
+                               <f:render partial="Action/Common/Left" arguments="{_all}" />
+                       </div>
+                       <div class="col-sm-12 col-md-9 content-area">
+                               <f:render section="Content" />
                        </div>
                </div>
        </div>
index 6a9598f..699e5f9 100644 (file)
@@ -1,8 +1,3 @@
-<div id="t3-install-head">
-   <div id="t3-install-logo">
-               <h1>TYPO3 CMS {typo3Version}</h1>
-       </div>
-       <div id="t3-install-headline">
-               <h2>TYPO3 CMS {typo3Version} Install tool on site: {siteName}</h2>
-       </div>
+<div class="page-header">
+       <h1 class="logo-pageheader"><img src="../Resources/Public/Images/typo3_orange.svg" width="130" class="logo" /> Install tool on site: {siteName} <small>TYPO3 CMS {typo3Version}</small></h1>
 </div>
\ No newline at end of file
index 0b599cd..5a43d7e 100644 (file)
@@ -1,5 +1,6 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9">
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/Install.css?{time}" />
+<link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
 <script type="text/javascript" src="../../core/Resources/Public/JavaScript/Contrib/jquery/jquery-2.1.4.min.js?{time}"></script>
+<script type="text/javascript" src="../Resources/Public/JavaScript/bootstrap.min.js?{time}"></script>
 <script type="text/javascript" src="../Resources/Public/JavaScript/Install.js?{time}"></script>
index 32a7a3b..7358c3d 100644 (file)
@@ -1,62 +1,41 @@
-<div id="t3-install-left">
-       <ol id="t3-install-menu">
-               <li id="t3-install-menu-importantActions" class="{f:if(condition:'{action} == \'importantActions\'', then:'act')}">
-                       <a href="Install.php?install[action]=importantActions&install[context]={context}&install[controller]=tool">
-                               Important actions
-                       </a>
-               </li>
-               <li id="t3-install-menu-configuration" class="{f:if(condition:'{action} == \'configuration\'', then:'act')}">
-                       <a href="Install.php?install[action]=configuration&install[context]={context}&install[controller]=tool">
-                               Configuration Presets
-                       </a>
-               </li>
-               <li id="t3-install-menu-allConfiguration" class="{f:if(condition:'{action} == \'allConfiguration\'', then:'act')}">
-                       <a href="Install.php?install[action]=allConfiguration&install[context]={context}&install[controller]=tool">
-                               All configuration
-                       </a>
-               </li>
-               <li id="t3-install-menu-upgradeWizard" class="{f:if(condition:'{action} == \'upgradeWizard\'', then:'act')}">
-                       <a href="Install.php?install[action]=upgradeWizard&install[context]={context}&install[controller]=tool">
-                               Upgrade Wizard
-                       </a>
-               </li>
-               <li id="t3-install-menu-systemEnvironment" class="{f:if(condition:'{action} == \'systemEnvironment\'', then:'act')}">
-                       <a href="Install.php?install[action]=systemEnvironment&install[context]={context}&install[controller]=tool">
-                               System environment
-                       </a>
-               </li>
-               <li id="t3-install-menu-folderStructure" class="{f:if(condition:'{action} == \'folderStructure\'', then:'act')}">
-                       <a href="Install.php?install[action]=folderStructure&install[context]={context}&install[controller]=tool">
-                               Folder structure
-                       </a>
-               </li>
-               <li id="t3-install-menu-testSetup" class="{f:if(condition:'{action} == \'testSetup\'', then:'act')}">
-                       <a href="Install.php?install[action]=testSetup&install[context]={context}&install[controller]=tool">
-                               Test setup
-                       </a>
-               </li>
-               <li id="t3-install-menu-cleanUp" class="{f:if(condition:'{action} == \'cleanUp\'', then:'act')}">
-                       <a href="Install.php?install[action]=cleanUp&install[context]={context}&install[controller]=tool">
-                               Clean up
-                       </a>
-               </li>
-               <li id="t3-install-menu-about" class="{f:if(condition:'{action} == \'about\'', then:'act')}">
-                       <a href="Install.php?install[action]=about&install[context]={context}&install[controller]=tool">
-                               About
-                       </a>
-               </li>
-       </ol>
-       <ol id="t3-install-menu-logout">
-               <li>
-                       <a href="Install.php?install[action]=logout&install[context]={context}&install[controller]=tool">Logout from Install Tool</a>
-               </li>
-       </ol>
-       <ol id="t3-install-links">
-               <li>
-                       <a href="../../../index.php">Backend admin</a>
-               </li>
-               <li>
-                       <a href="../../../../index.php">Frontend website</a>
-               </li>
-       </ol>
-</div>
\ No newline at end of file
+<div id="menuWrapper" data-spy="affix" data-offset-top="60" data-offset-bottom="190">
+       <div class="list-group" id="t3-install-left">
+               <a href="Install.php?install[action]=importantActions&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'importantActions\'', then:'active')}">
+                       Important actions
+               </a>
+               <a href="Install.php?install[action]=configuration&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'configuration\'', then:'active')}">
+                       Configuration Presets
+               </a>
+               <a href="Install.php?install[action]=allConfiguration&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'allConfiguration\'', then:'active')}">
+                       All configuration
+               </a>
+               <a href="Install.php?install[action]=upgradeWizard&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'upgradeWizard\'', then:'active')}">
+                       Upgrade Wizard
+               </a>
+               <a href="Install.php?install[action]=systemEnvironment&install[context]={context}&install[controller]=tool" id="t3-install-menu-systemEnvironment" class="list-group-item {f:if(condition:'{action} == \'systemEnvironment\'', then:'active')}">
+                       System environment
+               </a>
+               <a href="Install.php?install[action]=folderStructure&install[context]={context}&install[controller]=tool" id="t3-install-menu-folderStructure" class="list-group-item {f:if(condition:'{action} == \'folderStructure\'', then:'active')}">
+                       Folder structure
+               </a>
+               <a href="Install.php?install[action]=testSetup&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'testSetup\'', then:'active')}">
+                       Test setup
+               </a>
+               <a href="Install.php?install[action]=cleanUp&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'cleanUp\'', then:'active')}">
+                       Clean up
+               </a>
+               <a href="Install.php?install[action]=about&install[context]={context}&install[controller]=tool" class="list-group-item {f:if(condition:'{action} == \'about\'', then:'active')}">
+                       About
+               </a>
+       </div>
+       <hr>
+       <a href="Install.php?install[action]=logout&install[context]={context}&install[controller]=tool" class="btn btn-warning btn-block">Logout from Install Tool</a>
+       <f:if condition="{contextService.backendContext}">
+               <f:then></f:then>
+               <f:else>
+                       <hr>
+                       <a href="../../../index.php" class="btn btn-default btn-block">Backend admin</a><br>
+                       <a href="../../../../index.php" class="btn btn-default btn-block">Frontend website</a>
+               </f:else>
+       </f:if>
+</div>
index 23a9c6a..70390f2 100644 (file)
@@ -1,43 +1,47 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
-<h1></h1>
+<div class="container">
+       <div class="page-header">
+               <h1 class="logo-pageheader"><img src="../Resources/Public/Images/typo3_orange.svg" width="130" class="logo" /> Site: {siteName} <small>Login to TYPO3 {typo3Version} Install Tool</small></h1>
+       </div>
+       <div class="row">
 
-<h2>Login to TYPO3 {typo3Version} Install Tool</h2>
+       </div>
+       <div id="t3-install-box-body">
+               <h3></h3>
 
-<div id="t3-install-box-body">
-       <h3>Site: {siteName}</h3>
+               <form method="post" class="form-inline" id="t3-install-form-login">
+                       <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
+                       <div class="form-group form-group-lg">
+                               <label for="t3-install-form-password">Password</label>
+                               <input id="t3-install-form-password" type="password" name="install[values][password]" class="t3-install-form-input-text form-control input-lg" autofocus="autofocus" />
+                       </div>
+                       <f:render partial="Action/Common/SubmitButton" arguments="{name:'login', text:'Login', className:'btn-lg'}"/>
+               </form>
+       </div>
+       <div id="t3-install-box-border-bottom">&nbsp;</div>
+       <f:if condition="{messages}">
+               <f:for each="{messages}" as="message">
+                       <f:render partial="Action/Common/StatusMessage" arguments="{message: message}" />
+               </f:for>
+       </f:if>
 
-       <form method="post" id="t3-install-form-login">
-               <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-               <fieldset>
-                       <ol>
-                               <li class="t3-install-form-label-width-7">
-                                       <label for="t3-install-form-password">Password</label>
-                                       <input id="t3-install-form-password" type="password" name="install[values][password]" class="t3-install-form-input-text" autofocus="autofocus" />
-                               </li>
-                       </ol>
-               </fieldset>
-
-               <f:render partial="Action/Common/SubmitButton" arguments="{name:'login', text:'Login'}"/>
-       </form>
+       <div class="panel panel-info">
+               <div class="panel-heading"><h3 class="panel-title">Information:</h3></div>
+               <div class="panel-body">
+                       By default the install tool password is the one specified during the installation.
+               </div>
+       </div>
+       <div class="panel panel-warning">
+               <div class="panel-heading"><h3 class="panel-title">Important:</h3></div>
+               <div class="panel-body">
+                       If you don't know the current password, you can set a new one by setting the value of
+                       $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] in typo3conf/LocalConfiguration.php to
+                       the hash value of the password you desire, which will be shown if you enter the desired password
+                       in this form and submit it.
+                       <br /><br />
+                       This password gives an attacker full control over your instance if cracked. It should be strong
+                       (include lower and upper case characters, special characters and numbers) and at least eight characters long.
+               </div>
+       </div>
 </div>
-<div id="t3-install-box-border-bottom">&nbsp;</div>
-
-<f:if condition="{messages}">
-       <f:for each="{messages}" as="message">
-               <f:render partial="Action/Common/StatusMessage" arguments="{message: message}" />
-       </f:for>
-</f:if>
-
-<p class="typo3-message message-information">
-       By default the install tool password is the one specified during the installation.
-</p>
-<p class="typo3-message message-warning">
-       If you don't know the current password, you can set a new one by setting the value of
-       $GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] in typo3conf/LocalConfiguration.php to
-       the hash value of the password you desire, which will be shown if you enter the desired password
-       in this form and submit it.
-       <br /><br />
-       This password gives an attacker full control over your instance if cracked. It should be strong
-       (include lower and upper case characters, special characters and numbers) and at least eight characters long.
-</p>
\ No newline at end of file
index bd5c9de..9fcea9a 100644 (file)
@@ -1,10 +1,6 @@
-<div class="typo3-message message-{message.severity}">
-       <div class="header-container">
-               <div class="message-header message-left"><strong>{message.title}</strong></div>
-               <div class="message-header message-right"></div>
-       </div>
-       <div class="message-body">
-               <f:format.nl2br>{message.message}</f:format.nl2br>
-       </div>
+<div class="t3js-message typo3-message alert alert-{message.severity}" role="alert">
+       <h4>{message.title}</h4>
+       <f:if condition="{message.message}">
+               <p class="messageText"><f:format.nl2br>{message.message}</f:format.nl2br></p>
+       </f:if>
 </div>
-<p></p>
\ No newline at end of file
index c1990a0..91f3928 100644 (file)
@@ -1,13 +1 @@
-<fieldset class="t3-install-form-submit">
-       <ol>
-               <li>
-                       <button
-                                       class="btn btn-default {className}"
-                                       type="submit"
-                                       name="install[set][{name}]"
-                                       >
-                               {text}
-                       </button>
-               </li>
-       </ol>
-</fieldset>
\ No newline at end of file
+<button class="btn btn-default {className}" type="submit" name="install[set][{name}]">{text}</button>
\ No newline at end of file
index 417e50c..feb7d1f 100644 (file)
@@ -1,76 +1,80 @@
-<form method="post">
+<form method="post" class="form-horizontal">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <input type="hidden" value="execute" name="install[set]" />
 
-       <fieldset class="t3-install-form-label-width-7">
-               <ol>
-                       <f:if condition="{renderConnectDetailsUsername}">
-                               <li>
-                                       <label for="t3-install-step-username">Username</label>
-                                       <input id="t3-install-step-username" class="t3-install-form-input-text" type="text" value="{username}" name="install[values][username]" autocomplete="off" />
-                               </li>
-                       </f:if>
-
-                       <f:if condition="{renderConnectDetailsPassword}">
-                               <li>
-                                       <label for="t3-install-step-password">Password</label>
-                                       <input id="t3-install-step-password" class="t3-install-form-input-text" type="password" value="{password}" name="install[values][password]" autocomplete="off" />
-                               </li>
-                       </f:if>
-
-                       <f:if condition="{renderConnectDetailsHost}">
-                               <li>
-                                       <label for="t3-install-step-type">Type</label>
-                                       <select id="t3-install-step-type">
-                                               <option value="tcp">TCP/IP based connection</option>
-                                               <option value="socket" {f:if(condition:'{host} == \'localhost\'',then:'selected="selected"')}>Socket based connection</option>
-                                       </select>
-                               </li>
-                               <li>
-                                       <label for="t3-install-step-host">Host</label>
-                                       <input id="t3-install-step-host" class="t3-install-form-input-text" type="text" value="{host}" name="install[values][host]" />
-                               </li>
-                       </f:if>
-
-                       <f:if condition="{renderConnectDetailsPort}">
-                               <li>
-                                       <label for="t3-install-step-port">Port</label>
-                                       <input id="t3-install-step-port" class="t3-install-form-input-text" type="text" value="{port}" name="install[values][port]" />
-                               </li>
-                       </f:if>
-
-                       <f:if condition="{renderConnectDetailsSocket}">
-                               <li>
-                                       <label for="t3-install-step-socket">Socket</label>
-                                       <input id="t3-install-step-socket" class="t3-install-form-input-text" type="text" value="{socket}" name="install[values][socket]" placeholder="Default socket or enter name" />
-                               </li>
-                       </f:if>
-
-                       <f:if condition="{renderConnectDetailsDatabase}">
-                               <li>
-                                       <label for="t3-install-step-database">Database</label>
-                                       <input id="t3-install-step-database" class="t3-install-form-input-text" type="text" value="{database}" name="install[values][database]" />
-                               </li>
-                       </f:if>
-
-                       <f:if condition="{renderConnectDetailsOracleSidConnect}">
-                               <li>
-                                       <label for="t3-install-form-type">Oracle Sid</label>
-                                       <select id="t3-install-form-type" name="install[values][type]">
-                                               <option value="servicename">Service name</option>
-                                               <f:if condition="{oracleSidSelected}">
-                                                       <f:then>
-                                                               <option value="sid" selected="selected">SID</option>
-                                                       </f:then>
-                                                       <f:else>
-                                                               <option value="sid">SID</option>
-                                                       </f:else>
-                                               </f:if>
-                                       </select>
-                               </li>
-                       </f:if>
-               </ol>
-       </fieldset>
+       <f:if condition="{renderConnectDetailsUsername}">
+               <div class="form-group">
+                       <label for="t3-install-step-username" class="control-label col-md-2">Username</label>
+                       <div class="col-md-7">
+                               <input id="t3-install-step-username" class="form-control" type="text" value="{username}" name="install[values][username]" autocomplete="off" />
+                       </div>
+               </div>
+       </f:if>
+       <f:if condition="{renderConnectDetailsPassword}">
+               <div class="form-group">
+                       <label for="t3-install-step-password" class="control-label col-md-2">Password</label>
+                       <div class="col-md-7">
+                               <input id="t3-install-step-password" class="form-control" type="password" value="{password}" name="install[values][password]" autocomplete="off" />
+                       </div>
+               </div>
+       </f:if>
+       <f:if condition="{renderConnectDetailsHost}">
+               <div class="form-group">
+                       <label for="t3-install-step-type" class="control-label col-md-2">Type</label>
+                       <div class="col-md-7">
+                               <select id="t3-install-step-type" class="form-control">
+                                       <option value="tcp">TCP/IP based connection</option>
+                                       <option value="socket" {f:if(condition:'{host} == \'localhost\'',then:'selected="selected"')}>Socket based connection</option>
+                               </select>
+                       </div>
+               </div>
+               <div class="form-group">
+                       <label for="t3-install-step-host" class="control-label col-md-2">Host</label>
+                       <div class="col-md-7">
+                               <input id="t3-install-step-host" class="t3-install-form-input-text form-control" type="text" value="{host}" name="install[values][host]" />
+                       </div>
+               </div>
+       </f:if>
+       <f:if condition="{renderConnectDetailsPort}">
+               <div class="form-group">
+                       <label for="t3-install-step-port" class="control-label col-md-2">Port</label>
+                       <div class="col-md-7">
+                               <input id="t3-install-step-port" class="t3-install-form-input-text form-control" type="text" value="{port}" name="install[values][port]" />
+                       </div>
+               </div>
+       </f:if>
+       <f:if condition="{renderConnectDetailsSocket}">
+               <div class="form-group">
+                       <label for="t3-install-step-socket" class="control-label col-md-2">Socket</label>
+                       <div class="col-md-7">
+                               <input id="t3-install-step-socket" class="t3-install-form-input-text form-control" type="text" value="{socket}" name="install[values][socket]" placeholder="Default socket or enter name" />
+                       </div>
+               </div>
+       </f:if>
+       <f:if condition="{renderConnectDetailsDatabase}">
+               <div class="form-group">
+                       <label for="t3-install-step-database" class="control-label col-md-2">Database</label>
+                       <div class="col-md-7">
+                               <input id="t3-install-step-database" class="t3-install-form-input-text form-control" type="text" value="{database}" name="install[values][database]" />
+                       </div>
+               </div>
+       </f:if>
+       <f:if condition="{renderConnectDetailsOracleSidConnect}">
+               <div class="form-group">
+                       <label for="t3-install-form-type" class="control-label col-md-2">Oracle Sid</label>
+                       <div class="col-md-7"><select id="t3-install-form-type" name="install[values][type]" class="form-control">
+                               <option value="servicename">Service name</option>
+                               <f:if condition="{oracleSidSelected}">
+                                       <f:then>
+                                               <option value="sid" selected="selected">SID</option>
+                                       </f:then>
+                                       <f:else>
+                                               <option value="sid">SID</option>
+                                       </f:else>
+                               </f:if>
+                       </select></div>
+               </div>
+       </f:if>
 
        <button class="btn btn-default" type="submit">
                Continue
index 5388ffa..37aae91 100644 (file)
@@ -1,5 +1,5 @@
-<ul class="steps_123">
-       <f:for each="{steps}" as="step">
-               <li class="{step.class}"><span>{step.number}</span></li>
-       </f:for>
-</ul>
+<div class="progress">
+       <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{currentStep.percent}" aria-valuemin="0" aria-valuemax="100" style="width: {currentStep.percent}%;">
+               {currentStep.number} / {currentStep.total} - {currentStep.percent}% Complete
+       </div>
+</div>
index c59fd39..c77bb80 100644 (file)
@@ -1,58 +1,72 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4><strong><i:object.arrayValueByKey array="{sections}" key="{sectionName}" /></strong> [{sectionName}]</h4>
+<div class="panel panel-default">
+       <div class="panel-heading" role="tab" id="heading{sectionName}">
+               <h3 class="panel-title">
+                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{sectionName}" aria-expanded="true" aria-controls="collapse{sectionName}">
+                               <strong><i:object.arrayValueByKey array="{sections}" key="{sectionName}" /></strong> [{sectionName}]
+                       </a>
+               </h3>
        </div>
-
-       <div class="toggleData" style="display:none">
+       <div id="collapse{sectionName}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading{sectionName}">
                <f:for each="{sectionData}" as="item">
+                       <a id="{sectionName}-{item.key}"></a>
                        <div class="item">
-                               <a id="{sectionName}-{item.key}"></a>
-                               <strong>[{sectionName}][{item.key}] </strong>
-                               <f:if condition="{item.type} == 'checkbox'">
-                                       <f:then>
-                                               = {item.value}
-                                       </f:then>
-                                       <f:else>
-                                               <f:if condition="{item.value}">
-                                                       = {item.value -> i:format.crop(maxCharacters: 40)}
-                                               </f:if>
-                                       </f:else>
-                               </f:if>
-                               <div class="item-description">
-                                       {item.description -> f:format.raw()}
-                               </div>
-                               <div class="item-value">
-                                       <f:if condition="{item.type} == 'textarea'">
-                                               <textarea
-                                                       rows="5"
-                                                       cols="60"
-                                                       name="install[values][{sectionName}][{item.key}]"
-                                               >{item.value}</textarea>
-                                       </f:if>
-
+                               <div class="item-heading">
+                                       <strong>[{sectionName}][{item.key}] </strong>
                                        <f:if condition="{item.type} == 'checkbox'">
-                                               <input
-                                                       type="hidden"
-                                                       value="0"
-                                                       name="install[values][{sectionName}][{item.key}]"
-                                               />
-                                               <input
-                                                       type="checkbox"
-                                                       value="1"
-                                                       name="install[values][{sectionName}][{item.key}]"
-                                                       {f:if(condition: item.checked, then:'checked="checked"')}
-                                               />
+                                               <f:then>
+                                                       = {item.value}
+                                               </f:then>
+                                               <f:else>
+                                                       <f:if condition="{item.value}">
+                                                               = {item.value -> i:format.crop(maxCharacters: 40)}
+                                                       </f:if>
+                                               </f:else>
                                        </f:if>
+                               </div>
+                               <div class="item-body">
+                                       <f:if condition="{item.type} == 'checkbox'">
+                                                       <div class="checkbox">
+                                                               <label>
+                                                                       <input
+                                                                                       type="checkbox"
+                                                                                       value="1"
+                                                                                       name="install[values][{sectionName}][{item.key}]"
+                                                                                       {f:if(condition: item.checked, then:'checked="checked"')}
+                                                                       />
+                                                                       {item.description -> f:format.raw()}
+                                                               </label>
+                                                       </div>
+                                                       <input
+                                                                       type="hidden"
+                                                                       value="0"
+                                                                       name="install[values][{sectionName}][{item.key}]"
+                                                       />
+                                               </f:if>
 
                                        <f:if condition="{item.type} == 'input'">
-                                               <input
-                                                       type="text"
-                                                       value="{item.value}"
-                                                       name="install[values][{sectionName}][{item.key}]"
-                                                       class="t3-install-form-input-text"
-                                               />
+                                               <div class="form-group">
+                                               <span class="help-block">{item.description -> f:format.raw()}</span>
+                                                       <input
+                                                                       type="text"
+                                                                       value="{item.value}"
+                                                                       name="install[values][{sectionName}][{item.key}]"
+                                                                       class="t3-install-form-input-text form-control"
+                                                       />
+                                               </div>
+                                       </f:if>
+
+                                       <f:if condition="{item.type} == 'textarea'">
+                                               <span class="help-block">{item.description -> f:format.raw()}</span>
+                                               <div class="form-group">
+                                                       <textarea
+                                                                       rows="5"
+                                                                       cols="60"
+                                                                       name="install[values][{sectionName}][{item.key}]"
+                                                                       class="form-control"
+                                                       >{item.value}</textarea>
+                                               </div>
                                        </f:if>
 
                                        <f:if condition="{item.phpErrorCode}">
index ed8a08e..8016efc 100644 (file)
@@ -1,4 +1,3 @@
-<h4>Clear tables</h4>
 
 <p>
        Use with care! Clearing tables here can have a negative impact on your site functionality.
 
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-
-       <f:for each="{cleanableTables}" as="cleanableTable">
-               <fieldset>
-                       <ol>
-                               <li class="t3-install-form-label-after">
+       <div class="form-group">
+               <f:for each="{cleanableTables}" as="cleanableTable">
+                       <div class="checkbox">
+                               <label>
                                        <input
                                                id="t3-install-database_clearcache-{cleanableTable.name}"
                                                name="install[values][{cleanableTable.name}]"
                                                value="1"
                                                type="checkbox"
                                        />
-                                       <label for="t3-install-database_clearcache-{cleanableTable.name}">
-                                               <strong>{cleanableTable.name}</strong>, Rows: {cleanableTable.rows}, Description: {cleanableTable.description}
-                                       </label>
-                               </li>
-                       </ol>
-               </fieldset>
-       </f:for>
+                                       <strong>{cleanableTable.name}</strong> Rows: {cleanableTable.rows}
+                               </label>
+                       </div>
+                       <p>Description: {cleanableTable.description}</p>
+                       <hr>
+               </f:for>
+       </div>
 
        <f:render
                partial="Action/Common/SubmitButton"
index 40b4f64..827827f 100644 (file)
-<h4>Clean typo3temp/ folder</h4>
 
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>About</h4>
-       </div>
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
-                       <p>
-                               TYPO3 uses this directory for temporary files, mainly processed and cached images.
-                               The filenames are cryptic. They are unique representations of the file properties
-                               made by md5-hashing a serialized array with information.
-                       </p>
-                       <p>
-                               This directory may contain many thousands of files and a lot of them may be of no use anymore.
-                       </p>
-                       <p>
-                               With this action you can delete the files in this folder. Afterwards, you
-                               should also clear the cache database tables.
-                       </p>
-                       <p>
-                               This tool will delete files only if the last 10 characters before the file extension
-                               ('.' + 3 chars) are hexadecimal valid ciphers, which are lowercase a-f and 0-9.
-                       </p>
-               </div>
-       </div>
+<div class="alert alert-notice">
+       <h4>About</h4>
+       <p>
+               TYPO3 uses this directory for temporary files, mainly processed and cached images.
+               The filenames are cryptic. They are unique representations of the file properties
+               made by md5-hashing a serialized array with information.
+       </p>
+       <p>
+               This directory may contain many thousands of files and a lot of them may be of no use anymore.
+       </p>
+       <p>
+               With this action you can delete the files in this folder. Afterwards, you
+               should also clear the cache database tables.
+       </p>
+       <p>
+               This tool will delete files only if the last 10 characters before the file extension
+               ('.' + 3 chars) are hexadecimal valid ciphers, which are lowercase a-f and 0-9.
+       </p>
 </div>
 
-<dl class="t3-install-definitionlist">
-       <dt>
-               Number of temporary files:
-       </dt>
-       <dd>
-               {typo3TempData.numberOfFilesInSelectedDirectory}
-       </dd>
-       <dt>
-               Number matching:
-       </dt>
-       <dd>
-               {typo3TempData.numberOfFilesMatchingCriteria}
-       </dd>
-       <dt>
-               Number deleted:
-       </dt>
-       <dd>
-               {typo3TempData.numberOfDeletedFiles}
-       </dd>
-</dl>
-
-<form method="post">
-       <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-
-       <fieldset>
-               <ol>
-                       <li>
-                               <label for="t3-install-delete">
-                                       Delete files by condition
-                               </label>
-                               <select
+<form method="post" class="form-horizontal">
+<div class="row">
+       <div class="col-sm-4">Number of temporary files:</div>
+       <div class="col-sm-8">{typo3TempData.numberOfFilesInSelectedDirectory}</div>
+</div>
+<div class="row">
+       <div class="col-sm-4">Number matching:</div>
+       <div class="col-sm-8">{typo3TempData.numberOfFilesMatchingCriteria}     </div>
+</div>
+<div class="row">
+       <div class="col-sm-4">Number deleted:</div>
+       <div class="col-sm-8">{typo3TempData.numberOfDeletedFiles}</div>
+</div>
+<div class="row">
+       <div class="form-group">
+               <label for="t3-install-delete" class="col-sm-4 control-label">Delete files by condition</label>
+               <div class="col-sm-7">
+                       <select
                                        id="t3-install-delete"
                                        name="install[values][condition]"
-                               >
-                                       <option value="0">All</option>
-                                       <option value="day" {f:if(condition:'{typo3TempData.selectedCondition} == \'day\'', then:'selected="selected"')}>Last access more than a day ago</option>
-                                       <option value="week" {f:if(condition:'{typo3TempData.selectedCondition} == \'week\'', then:'selected="selected"')}>Last access more than a week ago</option>
-                                       <option value="month" {f:if(condition:'{typo3TempData.selectedCondition} == \'month\'', then:'selected="selected"')}>Last access more than a month ago</option>
-                                       <option value="10" {f:if(condition:'{typo3TempData.selectedCondition} == \'10\'', then:'selected="selected"')}>File size greater than 10K</option>
-                                       <option value="50" {f:if(condition:'{typo3TempData.selectedCondition} == \'50\'', then:'selected="selected"')}>File size greater than 50K</option>
-                                       <option value="100" {f:if(condition:'{typo3TempData.selectedCondition} == \'100\'', then:'selected="selected"')}>File size greater than 100K</option>
-                               </select>
-                       </li>
-
-                       <li>
-                               <label for="t3-install-action">
-                                       Number of files at a time:
-                               </label>
-                               <select
+                                       class="form-control"
+                                       >
+                               <option value="0">All</option>
+                               <option value="day" {f:if(condition:'{typo3TempData.selectedCondition} == \'day\'', then:'selected="selected"')}>Last access more than a day ago</option>
+                               <option value="week" {f:if(condition:'{typo3TempData.selectedCondition} == \'week\'', then:'selected="selected"')}>Last access more than a week ago</option>
+                               <option value="month" {f:if(condition:'{typo3TempData.selectedCondition} == \'month\'', then:'selected="selected"')}>Last access more than a month ago</option>
+                               <option value="10" {f:if(condition:'{typo3TempData.selectedCondition} == \'10\'', then:'selected="selected"')}>File size greater than 10K</option>
+                               <option value="50" {f:if(condition:'{typo3TempData.selectedCondition} == \'50\'', then:'selected="selected"')}>File size greater than 50K</option>
+                               <option value="100" {f:if(condition:'{typo3TempData.selectedCondition} == \'100\'', then:'selected="selected"')}>File size greater than 100K</option>
+                       </select>
+               </div>
+       </div>
+       <div class="form-group">
+               <label for="t3-install-action" class="col-sm-4 control-label">Number of files at a time:</label>
+               <div class="col-sm-7">
+                       <select
                                        id="t3-install-action"
                                        name="install[values][numberOfFiles]"
-                               >
-                                       <option value="0">Don't delete, just display statistics</option>
-                                       <option value="500" {f:if(condition:'{typo3TempData.numberOfFiles} == \'500\'', then:'selected="selected"')}>Delete 500</option>
-                                       <option value="1000" {f:if(condition:'{typo3TempData.numberOfFiles} == \'1000\'', then:'selected="selected"')}>Delete 1000</option>
-                                       <option value="5000" {f:if(condition:'{typo3TempData.numberOfFiles} == \'5000\'', then:'selected="selected"')}>Delete 5000</option>
-                               </select>
-                       </li>
+                                       class="form-control"
+                                       >
+                               <option value="0">Don't delete, just display statistics</option>
+                               <option value="500" {f:if(condition:'{typo3TempData.numberOfFiles} == \'500\'', then:'selected="selected"')}>Delete 500</option>
+                               <option value="1000" {f:if(condition:'{typo3TempData.numberOfFiles} == \'1000\'', then:'selected="selected"')}>Delete 1000</option>
+                               <option value="5000" {f:if(condition:'{typo3TempData.numberOfFiles} == \'5000\'', then:'selected="selected"')}>Delete 5000</option>
+                       </select>
+               </div>
+       </div>
 
-                       <li>
-                               <label for="t3-install-subdirectory">
-                                       From sub-directory:
-                               </label>
-                               <select
-                                       id="t3-install-subdirectory"
-                                       name="install[values][subDirectory]"
+       <div class="form-group">
+               <label for="t3-install-subdirectory" class="col-sm-4 control-label">From sub-directory:</label>
+               <div class="col-sm-7">
+                       <select
+                               id="t3-install-subdirectory"
+                               name="install[values][subDirectory]"
+                               class="form-control"
                                >
-                                       <f:for each="{typo3TempData.subDirectories}" as="subDirectory">
-                                               <option
-                                                       value="{subDirectory.name}"
-                                                       {f:if(condition:subDirectory.selected, then:'selected="selected"')}
-                                               >
-                                                       <f:if condition="{subDirectory.name}">
-                                                               {subDirectory.name}/ (Files: {subDirectory.filesNumber})
-                                                       </f:if>
-                                               </option>
-                                       </f:for>
-                               </select>
-                       </li>
-               </ol>
-       </fieldset>
-
-       <f:render
-               partial="Action/Common/SubmitButton"
-               arguments="{name:'deleteTypo3TempFiles', text:'Empty selected folders'}"
-       />
-</form>
\ No newline at end of file
+                       <f:for each="{typo3TempData.subDirectories}" as="subDirectory">
+                               <option
+                                               value="{subDirectory.name}"
+                                               {f:if(condition:subDirectory.selected, then:'selected="selected"')}
+                               >
+                               <f:if condition="{subDirectory.name}">
+                                       {subDirectory.name}/ (Files: {subDirectory.filesNumber})
+                               </f:if>
+                               </option>
+                       </f:for>
+                       </select>
+               </div>
+       </div>
+       <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
+       <div class="col-sm-12">
+               <f:render
+                       partial="Action/Common/SubmitButton"
+                       arguments="{name:'deleteTypo3TempFiles', text:'Empty selected folders'}"
+               />
+       </div>
+</div>
+</form>
index a041c73..a7bd25c 100644 (file)
@@ -1,17 +1,19 @@
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Character set conversion settings</h4>
+<div class="panel panel-default">
+       <div class="panel-heading" role="tab" id="headingOne">
+               <h4 class="panel-title">
+                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                               Character set conversion settings
+                       </a>
+               </h4>
        </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
+       <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+               <div class="panel-body">
                        <p>
                                Charset conversion is done at various places in the TYPO3 CMS core
                                and can lead to massive performance problems if not set right. In
                                general the first available setting should be selected for maximum
                                performance and fewest problems.
                        </p>
-
                        <f:for each="{feature.presetsOrderedByPriority}" as="preset">
                                <f:render partial="Action/Tool/Configuration/{feature.name}/{preset.name}" arguments="{_all}" />
                        </f:for>
index 9d44860..e3b57ae 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-warning">
+<div class="alert alert-warning">
        <div class="header-container">
                <div class="message-header">
                        <input
index 285bde0..35c2856 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-warning">
+<div class="alert alert-warning">
        <div class="header-container">
                <div class="message-header">
                        <input
                </p>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
-                       <div>
-                               <input
-                                       type="input"
-                                       name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
-                                       value="{configurationValue}"
-                               />
-                               {configurationKey}
+                       <div class="form-group">
+                               <label class="col-sm-4 control-label">{configurationKey}</label>
+                               <div class="col-sm-8">
+                                       <input
+                                               type="input"
+                                               name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+                                               value="{configurationValue}"
+                                               class="form-control"
+                                       />
+                               </div>
                        </div>
                </f:for>
        </div>
index 77da924..47f3bdc 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message {f:if(condition:'{preset.isAvailable}', then:'message-ok', else:'message-error')}">
+<div class="alert {f:if(condition:'{preset.isAvailable}', then:'alert-success', else:'alert-danger')}">
        <div class="header-container">
                <div class="message-header">
                        <input
index 86cb1cc..6371f3d 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message {f:if(condition:'{preset.isAvailable}', then:'message-ok', else:'message-error')}">
+<div class="alert {f:if(condition:'{preset.isAvailable}', then:'alert-success', else:'alert-danger')}">
        <div class="header-container">
                <div class="message-header">
                        <input
index 65fa66e..ec3ea86 100644 (file)
@@ -1,10 +1,13 @@
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Debug settings</h4>
+<div class="panel panel-default">
+       <div class="panel-heading" role="tab" id="headingTwo">
+               <h4 class="panel-title">
+                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
+                               Debug settings
+                       </a>
+               </h4>
        </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
+       <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+               <div class="panel-body">
                        <p>
                                In this panel it is possible to select a configuration preset which optimizes multiple settings
                                to be suited best for production or development environments.
@@ -18,4 +21,4 @@
                        </f:for>
                </div>
        </div>
-</div>
+</div>
\ No newline at end of file
index 1b1fe08..2a50e95 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-warning">
+<div class="alert alert-warning">
        <div class="header-container">
                <div class="message-header">
                        <input
                </p>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
-                       <div>
-                               <input
-                                       type="input"
-                                       name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
-                                       value="{configurationValue}"
-                               />
-                               {configurationKey}
+                       <div class="form-group">
+                               <label class="col-sm-4 control-label">{configurationKey}</label>
+                               <div class="col-sm-8">
+                                       <input
+                                               type="input"
+                                               name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+                                               value="{configurationValue}"
+                                               class="form-control"
+                                       />
+                               </div>
                        </div>
                </f:for>
        </div>
index 0ab8367..de184ba 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-ok">
+<div class="alert alert-success">
        <div class="header-container">
                <div class="message-header">
                        <input
index ec8061d..e9ebcc9 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-ok">
+<div class="alert alert-success">
        <div class="header-container">
                <div class="message-header">
                        <input
index 86d4076..8cb0e4b 100644 (file)
@@ -1,10 +1,13 @@
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Extbase object cache</h4>
+<div class="panel panel-default">
+       <div class="panel-heading" role="tab" id="headingThree">
+               <h4 class="panel-title">
+                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
+                               Extbase object cache
+                       </a>
+               </h4>
        </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
+       <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
+               <div class="panel-body">
                        <p>
                                To speed up object instantiation, Extbase stores some cache data. This can lead
                                to lots of SELECT database queries on each page hit if the cache is configured
                                for one request. These characteristics make it well suited to be used in
                                combination with a APC cache backend.
                        </p>
-
                        <f:for each="{feature.presetsOrderedByPriority}" as="preset">
                                <f:render partial="Action/Tool/Configuration/{feature.name}/{preset.name}" arguments="{_all}" />
                        </f:for>
                </div>
        </div>
-</div>
+</div>
\ No newline at end of file
index aa3f0d8..d2ec47f 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message {f:if(condition:'{preset.isAvailable}', then:'message-ok', else:'message-warning')}">
+<div class="alert {f:if(condition:'{preset.isAvailable}', then:'alert-success', else:'alert-warning')}">
        <div class="header-container">
                <div class="message-header">
                        <input
index 8d39b99..5be8a2d 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-ok">
+<div class="alert alert-success">
        <div class="header-container">
                <div class="message-header">
                        <input
index fe647f8..3a9aba6 100644 (file)
@@ -1,10 +1,13 @@
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Image handling settings</h4>
+<div class="panel panel-default">
+       <div class="panel-heading" role="tab" id="headingFour">
+               <h4 class="panel-title">
+                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
+                               Image handling settings
+                       </a>
+               </h4>
        </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
+       <div id="collapseFour" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFour">
+               <div class="panel-body">
                        <p>
                                Advanced image handling in TYPO3 CMS uses the command line tool
                                GraphicsMagick or ImageMagick. The tool needs to be configured
                                If ImageMagick or GraphicsMagick executables are located in an unusual place,
                                set the absolute directory name here.
                        </p>
-                       <p>
-                               <input
-                                       type="input"
-                                       name="install[values][{feature.name}][additionalSearchPath]"
-                                       value="{feature.additionalSearchPath}"
-                               />
-                               <button class="btn btn-default" type="submit" name="install[set][ImageSearch]">Find executables in this directory</button>
-                       </p>
+                       <div class="form-group">
+                               <div class="col-sm-12">
+                                       <div class="input-group">
+                                               <input
+                                                               type="input"
+                                                               name="install[values][{feature.name}][additionalSearchPath]"
+                                                               value="{feature.additionalSearchPath}"
+                                                               class="form-control"
+                                               />
+                                               <div class="input-group-btn"><button class="btn btn-default" type="submit" name="install[set][ImageSearch]">Find executables in this directory</button></div>
+                                       </div>
+                               </div>
+                       </div>
 
                        <f:for each="{feature.presetsOrderedByPriority}" as="preset">
                                <f:render partial="Action/Tool/Configuration/{feature.name}/{preset.name}" arguments="{_all}" />
index f716a16..133d506 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-warning">
+<div class="alert alert-warning">
        <div class="header-container">
                <div class="message-header">
                        <input
                </p>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
-                       <div>
-                               <input
-                                       type="input"
-                                       name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
-                                       value="{configurationValue}"
-                               />
-                               {configurationKey}
+                       <div class="form-group">
+                               <label class="col-sm-4 control-label">{configurationKey}</label>
+                               <div class="col-sm-8">
+                                       <input
+                                               type="input"
+                                               name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+                                               value="{configurationValue}"
+                                               class="form-control"
+                                       />
+                               </div>
                        </div>
                </f:for>
        </div>
index 6fd58c1..f64f235 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message {f:if(condition:'{preset.isAvailable}', then:'message-ok', else:'message-error')}">
+<div class="alert {f:if(condition:'{preset.isAvailable}', then:'alert-success', else:'alert-danger')}">
        <div class="header-container">
                <div class="message-header">
                        <input
index c49ff74..15b80a0 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message {f:if(condition:'{preset.isAvailable}', then:'message-ok', else:'message-error')}">
+<div class="alert {f:if(condition:'{preset.isAvailable}', then:'alert-success', else:'alert-danger')}">
        <div class="header-container">
                <div class="message-header">
                        <input
index effc017..b50e150 100644 (file)
@@ -1,10 +1,13 @@
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Mail handling settings</h4>
+<div class="panel panel-default">
+       <div class="panel-heading" role="tab" id="headingFive">
+               <h4 class="panel-title">
+                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
+                               Mail handling settings
+                       </a>
+               </h4>
        </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
+       <div id="collapseFive" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingFive">
+               <div class="panel-body">
                        <p>
                                Mailer agent in TYPO3 CMS can use the sendmail command line tool
                                if transport is configured to sendmail. The tool path needs to be
                                This module detects the current sendmail path from PHP settings
                                and allows to set the correct value in TYPO3 settings.
                        </p>
-
                        <f:for each="{feature.presetsOrderedByPriority}" as="preset">
                                <f:render partial="Action/Tool/Configuration/{feature.name}/{preset.name}" arguments="{_all}" />
                        </f:for>
                </div>
        </div>
-</div>
+</div>
\ No newline at end of file
index 62f096b..28fe86e 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message message-warning">
+<div class="alert alert-warning">
        <div class="header-container">
                <div class="message-header">
                        <input
                </p>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
-                       <div>
-                               <input
-                                       type="input"
-                                       name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
-                                       value="{configurationValue}"
-                                       />
-                               {configurationKey}
+                       <div class="form-group">
+                               <label class="col-sm-6 control-label">{configurationKey}</label>
+                               <div class="col-sm-6">
+                                       <input
+                                               type="input"
+                                               name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
+                                               value="{configurationValue}"
+                                               class="form-control"
+                                               />
+                               </div>
                        </div>
                </f:for>
        </div>
index 1eeaac8..9ea3c6e 100644 (file)
@@ -1,4 +1,4 @@
-<div class="typo3-message {f:if(condition:'{preset.isAvailable}', then:'message-ok', else:'message-error')}">
+<div class="alert {f:if(condition:'{preset.isAvailable}', then:'alert-success', else:'alert-danger')}">
        <div class="header-container">
                <div class="message-header">
                        <input
index cd2c87c..5ae4942 100644 (file)
@@ -1,19 +1,17 @@
-<h4>Change site name</h4>
-<form method="post">
+<h3>Change site name</h3>
+<form method="post" class="form-horizontal">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-       <fieldset>
-               <ol>
-                       <li>
-                               <label for="t3-install-form-sitename">Site name:</label>
-                               <input
+       <div class="form-group">
+               <label for="t3-install-form-sitename" class="col-sm-3 control-label">Site name:</label>
+               <div class="col-sm-9">
+                       <input
                                        id="t3-install-form-sitename"
                                        type="text"
                                        name="install[values][newSiteName]"
                                        value="{siteName}"
-                                       class="t3-install-form-input-text"
-                               />
-                       </li>
-               </ol>
-       </fieldset>
+                                       class="t3-install-form-input-text form-control"
+                                       />
+               </div>
+       </div>
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'changeSiteName', text:'Change name'}"/>
-</form>
\ No newline at end of file
+</form>
index 0ca9497..ad95b71 100644 (file)
@@ -1,4 +1,4 @@
-<h4>Clear all cache</h4>
+<h3>Clear all cache</h3>
 <p>
        This clear all cache function works in a similar manner as the cache clearing in the backend, but takes a
        more straightforward approach and the according backend hooks are not executed.
@@ -10,4 +10,4 @@
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'clearAllCache', text:'Clear all cache'}"/>
-</form>
\ No newline at end of file
+</form>
index e5f098d..d0ba283 100644 (file)
@@ -1,5 +1,5 @@
 <f:if condition="{listOfOpcodeCaches}">
-       <h4>Clear PHP opcode cache</h4>
+       <h3>Clear PHP opcode cache</h3>
        <p>
                This clears the complete opcode caches of the active opcode cache systems, if the system supports reset.
        </p>
index b4ef19a..10d71fd 100644 (file)
@@ -1,4 +1,4 @@
-<h4>Core update</h4>
+<h3>Core update</h3>
 
 <p>
        The install tool can automatically update the TYPO3 CMS core to its latest
@@ -9,31 +9,22 @@
        <f:if condition="{enableCoreUpdate}">
                <f:then>
                        <div id="messageTemplate">
-                               <div class="typo3-message">
-                                       <div class="header-container">
-                                               <div class="message-header">
-                                                       <strong></strong>
-                                               </div>
-                                       </div>
-                                       <div class="message-body">
-                                       </div>
+                               <div class="t3js-message typo3-message alert">
+                                       <h4></h4>
+                                       <p class="messageText"></p>
                                </div>
                                <p></p>
                        </div>
                        <div id="buttonTemplate">
                                <fieldset class="t3-install-form-submit">
-                                       <ol>
-                                               <li>
-                                                       <button class="btn btn-default" type="submit" name="coreUpdateCheckForUpdate" data-action="checkForUpdate">
-                                                               Check for core updates
-                                                       </button>
-                                               </li>
-                                       </ol>
+                                       <button class="btn btn-default" type="submit" name="coreUpdateCheckForUpdate" data-action="checkForUpdate">
+                                                       Check for core updates
+                                       </button>
                                </fieldset>
                        </div>
                </f:then>
                <f:else>
-                       <div class="typo3-message message-notice">
+                       <div class="typo3-message alert alert-notice">
                                <div class="header-container">
                                        <div class="message-header">
                                                <strong>Disabled</strong>
index 06d6793..7fe2e2c 100644 (file)
@@ -1,43 +1,45 @@
-<h4>Create backend administrator user</h4>
+<h3>Create backend administrator user</h3>
 <p>
        You should use this function only if there are no admin users in the database, for instance if this is a blank database.
        After you've created the user, log in and add the rest of the user information, like email and real name.
 </p>
-<form method="post">
+<form method="post" class="form-horizontal">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-       <fieldset>
-               <ol>
-                       <li>
-                               <label for="t3-install-username">Username:</label>
-                               <input
+       <div class="form-group">
+               <label for="t3-install-username" class="col-sm-3 control-label">Username:</label>
+               <div class="col-sm-9">
+                       <input
                                        id="t3-install-username"
-                                       class="t3-install-form-input-text"
+                                       class="t3-install-form-input-text form-control"
                                        type="text"
                                        name="install[values][newUserUsername]"
                                        autocomplete="off"
-                               />
-                       </li>
-                       <li>
-                               <label for="t3-install-password">Password:</label>
-                               <input
+                                       />
+               </div>
+       </div>
+       <div class="form-group">
+               <label for="t3-install-password" class="col-sm-3 control-label">Password:</label>
+               <div class="col-sm-9">
+                       <input
                                        id="t3-install-password"
-                                       class="t3-install-form-input-text t3-install-form-password-strength"
+                                       class="t3-install-form-input-text t3-install-form-password-strength form-control"
                                        type="password"
                                        name="install[values][newUserPassword]"
                                        autocomplete="off"
-                               />
-                       </li>
-                       <li>
-                               <label for="t3-install-password-repeat">Repeat password:</label>
-                               <input
+                                       />
+               </div>
+       </div>
+       <div class="form-group">
+               <label for="t3-install-password-repeat" class="col-sm-3 control-label">Repeat password:</label>
+               <div class="col-sm-9">
+                       <input
                                        id="t3-install-password-repeat"
-                                       class="t3-install-form-input-text"
+                                       class="t3-install-form-input-text form-control"
                                        type="password"
                                        name="install[values][newUserPasswordCheck]"
                                        autocomplete="off"
-                               />
-                       </li>
-               </ol>
-       </fieldset>
+                                       />
+               </div>
+       </div>
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'createAdministrator', text:'Create administrator'}"/>
-</form>
\ No newline at end of file
+</form>
index 4868494..e281ed2 100644 (file)
@@ -1,4 +1,4 @@
-<h4>Database analyzer</h4>
+<h3>Database analyzer</h3>
 
 <p>
        The database analyzer compares the database table and field definitions of the
@@ -9,4 +9,4 @@
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'databaseAnalyzerAnalyze', text:'Compare current database with specification'}"/>
-</form>
\ No newline at end of file
+</form>
index 7bb5556..09fb493 100644 (file)
@@ -1,4 +1,4 @@
-<h4>Database analyzer</h4>
+<h3>Database analyzer</h3>
 
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
@@ -84,4 +84,4 @@
        </f:if>
 
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'databaseAnalyzerExecute', text:'Execute'}"/>
-</form>
\ No newline at end of file
+</form>
index 72f2338..1f18920 100644 (file)
@@ -1,4 +1,4 @@
-<h4>Check for broken extensions</h4>
+<h3>Check for broken extensions</h3>
 <p>
        Checks whether the local extensions' ext_tables and ext_localconf files can be included without errors,
        meaning they can be loaded without breaking the system.
index eb9b0e3..282e1f8 100644 (file)
@@ -1,29 +1,29 @@
-<h4>Change install tool password</h4>
-<form method="post">
+<h3>Change install tool password</h3>
+<form method="post" class="form-horizontal">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-       <fieldset>
-               <ol>
-                       <li>
-                               <label for="t3-install-password">Enter new password:</label>
-                               <input
-                                       id="t3-install-password"
-                                       class="t3-install-form-input-text t3-install-form-password-strength"
-                                       type="password"
-                                       name="install[values][newInstallToolPassword]"
-                                       autocomplete="off"
-                               />
-                       </li>
-                       <li>
-                               <label for="t3-install-password-repeat">Repeat password:</label>
-                               <input
+       <div class="form-group">
+               <label for="t3-install-password" class="col-sm-3 control-label">Enter new password:</label>
+               <div class="col-sm-9">
+                       <input
+                               id="t3-install-password"
+                               class="t3-install-form-input-text t3-install-form-password-strength form-control"
+                               type="password"
+                               name="install[values][newInstallToolPassword]"
+                               autocomplete="off"
+                       />
+               </div>
+       </div>
+       <div class="form-group">
+               <label for="t3-install-password-repeat" class="col-sm-3 control-label">Repeat password:</label>
+               <div class="col-sm-9">
+                       <input
                                        id="t3-install-password-repeat"
-                                       class="t3-install-form-input-text"
+                                       class="t3-install-form-input-text form-control"
                                        type="password"
                                        name="install[values][newInstallToolPasswordCheck]"
                                        autocomplete="off"
-                               />
-                       </li>
-               </ol>
-       </fieldset>
+                                       />
+               </div>
+       </div>
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'changeInstallToolPassword', text:'Set new password'}"/>
-</form>
\ No newline at end of file
+</form>
index fa4fdec..8ec9581 100644 (file)
@@ -1,4 +1,4 @@
-<h4>Change encryption key</h4>
+<h3>Change encryption key</h3>
 <p>
        The encryption key is a random string that should be unique for this TYPO3 CMS instance.
        It is a security relevant value and is never output directly.
@@ -8,4 +8,4 @@
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'changeEncryptionKey', text:'Set a new encryption key'}"/>
-</form>
\ No newline at end of file
+</form>
index ecd19a2..157006f 100644 (file)
@@ -1,37 +1,52 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
-<h4>Main system information</h4>
-
-<dl id="systemInformation">
-       <dt>Operating system:</dt>
-       <dd>{operatingSystem}</dd>
-       <dt>PHP version:</dt>
-       <dd><i:constant name="PHP_VERSION" /></dd>
-       <dt>PHP CGI detected:</dt>
-       <dd>{f:if(condition:cgiDetected, then:'Yes', else:'No')}</dd>
-       <dt>Database name:</dt>
-       <dd>{databaseName} </dd>
-       <dt>Database username:</dt>
-       <dd>{databaseUsername} </dd>
-       <dt>Database host:</dt>
-       <dd>{databaseHost} </dd>
+<h3>Main system information</h3>
+<table class="table table-striped">
+       <tr>
+               <td>Operating system:</td>
+               <td><strong>{operatingSystem}</strong></td>
+       </tr>
+       <tr>
+               <td>PHP version:</td>
+               <td><strong><i:constant name="PHP_VERSION" /></strong></td>
+       </tr>
+       <tr>
+               <td>PHP CGI detected:</td>
+               <td><strong>{f:if(condition:cgiDetected, then:'Yes', else:'No')}</strong></td>
+       </tr>
+       <tr>
+               <td>Database name:</td>
+               <td><strong>{databaseName}</strong></td>
+       </tr>
+       <tr>
+               <td>Database username:</td>
+               <td><strong>{databaseUsername}</strong></td>
+       </tr>
+       <tr>
+               <td>Database host:</td>
+               <td><strong>{databaseHost}</strong></td>
+       </tr>
+       <tr>
        <f:if condition="{databasePort}">
                <f:then>
-                       <dt>Database port:</dt>
-                       <dd>{databasePort} </dd>
+                       <td>Database port:</td>
+                       <td><strong>{databasePort}</strong></td>
                </f:then>
                <f:else>
-                       <dt>Database socket:</dt>
+                       <td>Database socket:</td>
                        <f:if condition="{databaseSocket}">
                                <f:then>
-                                       <dd>{databaseSocket} </dd>
+                                       <td><strong>{databaseSocket}</strong></td>
                                </f:then>
                                <f:else>
-                                       <dd><em>default socket</em> </dd>
+                                       <td><em>default socket</em> </td>
                                </f:else>
                        </f:if>
                </f:else>
        </f:if>
-       <dt>Database tables:</dt>
-       <dd>{databaseNumberOfTables} </dd>
-</dl>
+       </tr>
+       <tr>
+               <td>Database tables:</td>
+               <td><strong>{databaseNumberOfTables}</strong></td>
+       </tr>
+</table>
index 0d529b6..2293760 100644 (file)
@@ -1,62 +1,55 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>About image handling</h4>
-       </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
-                       <p>
-                               TYPO3 is known for its ability to process images on the server.
-                       </p>
-                       <p>
-                               In the backend interface (TBE) thumbnails are automatically generated
-                               as well as icons, menu items and pane tabs (by GDLib).
-                               In the frontend all kinds of graphical elements are processed. Typically images are
-                               scaled down to fit the pages (by ImageMagick) and menu items, graphical headers and
-                               such are generated automatically (by GDLib + ImageMagick). In addition TYPO3 is able
-                               to handle many file formats (thanks to ImageMagick), for example TIF, BMP, PCX, TGA,
-                               AI and PDF in addition to the standard web formats; JPG, GIF, PNG.
-                       </p>
-                       <p>
-                               In order to do this, TYPO3 uses two sets of tools:
-                       </p>
-                       <strong>
-                               ImageMagick / GraphicsMagick:
-                       </strong>
-                       <p>
-                               For conversion of non-web formats to webformats, combining images with alpha-masks,
-                               performing image-effects like blurring and sharpening.
-                       </p>
-                       <p>
-                               ImageMagick is a collection of external programs on the server called by the exec()
-                               function in PHP. TYPO3 uses three of these, namely 'convert' (converting fileformats,
-                               scaling, effects), 'combine'/'composite' (combining images with masks) and 'identify'
-                               (returns image information). GraphicsMagick is an alternative to ImageMagick and can
-                               be enabled by setting [GFX][im_version_5] to 'gm'. This is recommended and enabled
-                               by default. Because ImageMagick and Graphicsmagick are external programs, a requirement
-                               must be met: The programs must be installed on the server and working. ImageMagick is
-                               available for both Windows and Unix. The current version is 6+. ImageMagick homepage is
-                               at <a href="http://www.imagemagick.org/">http://www.imagemagick.org/</a>
-                       </p>
-                       <strong>
-                               GDLib:
-                       </strong>
-                       <p>
-                               For drawing boxes and rendering text on images with truetype fonts. Also used for
-                               icons, menuitems and generally the TypoScript GIFBUILDER object is based on GDlib,
-                               but extensively utilizing ImageMagick to process intermediate results.
-                       </p>
-                       <p>
-                               GDLib is accessed through internal functions in PHP, you'll need a version of PHP
-                               with GDLib compiled in. Also in order to use TrueType fonts with GDLib you'll
-                               need FreeType compiled in as well.
-                       </p>
-                       <p>
-                               You can disable all image processing options in TYPO3 ([GFX][image_processing]=0),
-                               but that would seriously disable TYPO3.
-                       </p>
-               </div>
-       </div>
+<div class="alert alert-notice">
+       <h4>About image handling</h4>
+       <p>
+               TYPO3 is known for its ability to process images on the server.
+       </p>
+       <p>
+               In the backend interface (TBE) thumbnails are automatically generated
+               as well as icons, menu items and pane tabs (by GDLib).
+               In the frontend all kinds of graphical elements are processed. Typically images are
+               scaled down to fit the pages (by ImageMagick) and menu items, graphical headers and
+               such are generated automatically (by GDLib + ImageMagick). In addition TYPO3 is able
+               to handle many file formats (thanks to ImageMagick), for example TIF, BMP, PCX, TGA,
+               AI and PDF in addition to the standard web formats; JPG, GIF, PNG.
+       </p>
+       <p>
+               In order to do this, TYPO3 uses two sets of tools:
+       </p>
+       <strong>
+               ImageMagick / GraphicsMagick:
+       </strong>
+       <p>
+               For conversion of non-web formats to webformats, combining images with alpha-masks,
+               performing image-effects like blurring and sharpening.
+       </p>
+       <p>
+               ImageMagick is a collection of external programs on the server called by the exec()
+               function in PHP. TYPO3 uses three of these, namely 'convert' (converting fileformats,
+               scaling, effects), 'combine'/'composite' (combining images with masks) and 'identify'
+               (returns image information). GraphicsMagick is an alternative to ImageMagick and can
+               be enabled by setting [GFX][im_version_5] to 'gm'. This is recommended and enabled
+               by default. Because ImageMagick and Graphicsmagick are external programs, a requirement
+               must be met: The programs must be installed on the server and working. ImageMagick is
+               available for both Windows and Unix. The current version is 6+. ImageMagick homepage is
+               at <a href="http://www.imagemagick.org/">http://www.imagemagick.org/</a>
+       </p>
+       <strong>
+               GDLib:
+       </strong>
+       <p>
+               For drawing boxes and rendering text on images with truetype fonts. Also used for
+               icons, menuitems and generally the TypoScript GIFBUILDER object is based on GDlib,
+               but extensively utilizing ImageMagick to process intermediate results.
+       </p>
+       <p>
+               GDLib is accessed through internal functions in PHP, you'll need a version of PHP
+               with GDLib compiled in. Also in order to use TrueType fonts with GDLib you'll
+               need FreeType compiled in as well.
+       </p>
+       <p>
+               You can disable all image processing options in TYPO3 ([GFX][image_processing]=0),
+               but that would seriously disable TYPO3.
+       </p>
 </div>
index 23168aa..ad19f72 100644 (file)
@@ -5,14 +5,6 @@
        <f:if condition="{combiningImagesTested}">
                <f:then>
 
-                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
-
-                       <p></p>
-
-                       <h4>Combining images</h4>
-
                        <p>
                                This verifies that the ImageMagick tool, 'combine'/'composite', is able to
                                combine two images through a grayscale mask.
                        <f:for each="{testResults}" as="test">
                                <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
                        </f:for>
+
+                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
                </f:then>
                <f:else>
                        <h4>Combining images</h4>
index 5fdbd78..3890bcb 100644 (file)
@@ -5,14 +5,6 @@
        <f:if condition="{convertImageFormatsToJpgTested}">
                <f:then>
 
-                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
-
-                       <p></p>
-
-                       <h4>Convert image formats to jpg</h4>
-
                        <p>
                                This verifies that your ImageMagick installation is able to read the default
                                formats jpg, gif, png, tif, bmp, pcx, tga, pdf and ai. The tool 'identify' is
                        <f:for each="{testResults}" as="test">
                                <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
                        </f:for>
+
+                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
                </f:then>
                <f:else>
                        <h4>Convert image formats to jpg</h4>
index 9e38abf..1353b61 100644 (file)
@@ -1,76 +1,79 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Current configuration</h4>
-       </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
-                       <dl class="t3-install-definitionlist">
-                               <dt>
-                                       {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')} enabled:
-                               </dt>
-                               <dd>
-                                       {f:if(condition:imageConfiguration.imageMagickEnabled, then:'Yes', else:'No')}
-                               </dd>
-
-                               <dt>
-                                       ImageMagick or GraphicsMagick:
-                               </dt>
-                               <dd>
-                                       {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')}
-                               </dd>
-
-                               <dt>
-                                       {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')} path:
-                               </dt>
-                               <dd>
-                                       {imageConfiguration.imageMagickPath}
-                               </dd>
-
-                               <dt>
-                                       {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')} version:
-                               </dt>
-                               <dd>
-                                       {imageConfiguration.imageMagickVersion}
-                               </dd>
-
-                               <dt>
-                                       IM5 effects enabled:
-                               </dt>
-                               <dd>
-                                       {imageConfiguration.imageMagick5Effects} <span>(Blurring/Sharpening with IM 5+)</span>
-                               </dd>
-
-                               <dt>
-                                       GDLib enabled:
-                               </dt>
-                               <dd>
-                                       {f:if(condition:imageConfiguration.gdlibEnabled, then:'Yes', else:'No')}
-                               </dd>
-
-                               <dt>
-                                       GDLib using PNG:
-                               </dt>
-                               <dd>
-                                       {imageConfiguration.gdlibPng}
-                               </dd>
-
-                               <dt>
-                                       Freetype DPI:
-                               </dt>
-                               <dd>
-                                       {imageConfiguration.freeTypeDpi} <span>(Should be 96 for Freetype 2)</span>
-                               </dd>
-
-                               <dt>
-                                       File Formats:
-                               </dt>
-                               <dd>
-                                       {imageConfiguration.fileFormats}
-                               </dd>
-                       </dl>
-               </div>
-       </div>
+<div class="alert alert-notice">
+       <h4>Current configuration</h4>
+       <table class="table table-striped">
+               <tr>
+                       <td>
+                               {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')} enabled:
+                       </td>
+                       <td>
+                               {f:if(condition:imageConfiguration.imageMagickEnabled, then:'Yes', else:'No')}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               ImageMagick or GraphicsMagick:
+                       </td>
+                       <td>
+                               {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')} path:
+                       </td>
+                       <td>
+                               {imageConfiguration.imageMagickPath}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               {f:if(condition:'{imageConfiguration.imageMagickOrGraphicsMagick} == \'im\'', then:'ImageMagick', else:'GrapicsMagick')} version:
+                       </td>
+                       <td>
+                               {imageConfiguration.imageMagickVersion}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               IM5 effects enabled:
+                       </td>
+                       <td>
+                               {imageConfiguration.imageMagick5Effects} <span>(Blurring/Sharpening with IM 5+)</span>
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               GDLib enabled:
+                       </td>
+                       <td>
+                               {f:if(condition:imageConfiguration.gdlibEnabled, then:'Yes', else:'No')}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               GDLib using PNG:
+                       </td>
+                       <td>
+                               {imageConfiguration.gdlibPng}
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               Freetype DPI:
+                       </td>
+                       <td>
+                               {imageConfiguration.freeTypeDpi} <span>(Should be 96 for Freetype 2)</span>
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               File Formats:
+                       </td>
+                       <td>
+                               {imageConfiguration.fileFormats}
+                       </td>
+               </tr>
+       </table>
 </div>
index f297ae6..284928f 100644 (file)
@@ -3,27 +3,16 @@
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <f:if condition="{gdlibTested}">
-               <f:then>
+               <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
+               <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
+               <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
+               <p>
+                       This verifies that the GDLib installation works properly.
+               </p>
 
-                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
-
-                       <p></p>
-
-                       <h4>GDlib</h4>
-
-                       <p>
-                               This verifies that the GDLib installation works properly.
-                       </p>
-
-                       <f:for each="{testResults}" as="test">
-                               <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
-                       </f:for>
-               </f:then>
-               <f:else>
-                       <h4>GDlib</h4>
-               </f:else>
+               <f:for each="{testResults}" as="test">
+                       <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
+               </f:for>
        </f:if>
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'testGdlib', text:'Test GDLib'}"/>
 </form>
\ No newline at end of file
index dbe2981..8189f39 100644 (file)
@@ -1,5 +1,3 @@
-<h4>Mail setup</h4>
-
 <p>
        You can check the basic mail functionality by entering your email address here and clicking the button.
        You should then receive a test email from "{senderEmailAddress}".
 
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-       <fieldset>
-               <ol>
-                       <li>
-                               <label
-                                       for="t3-install-checkmail"
-                               >
-                                       Email address:
-                               </label>
-                               <input
-                                       id="t3-install-checkmail"
-                                       type="email"
-                                       name="install[values][testEmailRecipient]"
-                                       class="t3-install-form-input-text"
-                               />
-                       </li>
-               </ol>
-       </fieldset>
+       <div class="form-group">
+               <label for="t3-install-checkmail">Email address:</label>
+               <input
+                       id="t3-install-checkmail"
+                       type="email"
+                       name="install[values][testEmailRecipient]"
+                       class="t3-install-form-input-text form-control"
+               />
+       </div>
        <f:render partial="Action/Common/SubmitButton" arguments="{name:'testMail', text:'Send test mail'}"/>
 </form>
index 0f2033c..c842c57 100644 (file)
@@ -4,13 +4,6 @@
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
        <f:if condition="{scalingImagesTested}">
                <f:then>
-                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
-
-                       <p></p>
-
-                       <h4>Scaling images</h4>
 
                        <p>
                                This shows how ImageMagick reacts when scaling transparent GIF and PNG files.
                        <f:for each="{testResults}" as="test">
                                <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
                        </f:for>
+
+                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
                </f:then>
                <f:else>
                        <h4>Scaling images</h4>
index 11aa17a..3afe919 100644 (file)
@@ -1,6 +1,5 @@
 <form method="post">
        <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-       <h4>True type font settings</h4>
        <f:if condition="{trueTypeFontTested}">
                <f:for each="{testResults}" as="test">
                        <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
index b10a714..e70a08b 100644 (file)
@@ -1,25 +1,18 @@
 {namespace i=TYPO3\CMS\Install\ViewHelpers}
 
-<div class="toggleGroup">
-       <div class="toggleButton">
-               <h4>Verify test results</h4>
-       </div>
-
-       <div class="toggleData" style="display:none">
-               <div class="toggleDataContent">
-                       <p>
-                               This page performs image processing and displays the result. It's a thorough check
-                               that everything you've configured is working correctly.
-                       </p>
-                       <p>
-                               It's quite simple to verify your installation; Just look down the page, the images
-                               in pairs should look like each other. If some images are not alike, something is
-                               wrong. You may also notice warnings and errors if this tool found signs of any problems.
-                       </p>
-                       <p>
-                               The image to the left is the reference image (how it should be) and to the right
-                               the image made by your server.
-                       </p>
-               </div>
-       </div>
+<div class="alert alert-notice">
+       <h4>Verify test results</h4>
+       <p>
+               This page performs image processing and displays the result. It's a thorough check
+               that everything you've configured is working correctly.
+       </p>
+       <p>
+               It's quite simple to verify your installation; Just look down the page, the images
+               in pairs should look like each other. If some images are not alike, something is
+               wrong. You may also notice warnings and errors if this tool found signs of any problems.
+       </p>
+       <p>
+               The image to the left is the reference image (how it should be) and to the right
+               the image made by your server.
+       </p>
 </div>
\ No newline at end of file
index 30ccca9..e753c16 100644 (file)
@@ -5,14 +5,6 @@
        <f:if condition="{writeGifAndPngTested}">
                <f:then>
 
-                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
-                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
-
-                       <p></p>
-
-                       <h4>Writing gif and png</h4>
-
                        <p>
                                This verifies that ImageMagick is able to write GIF and PNG files.
                                The GIF-file is attempted compressed with LZW by the
                        <f:for each="{testResults}" as="test">
                                <f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
                        </f:for>
+
+                       <f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
+                       <f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
                </f:then>
                <f:else>
                        <h4>Writing gif and png</h4>
index d802718..7f0c76d 100644 (file)
@@ -5,15 +5,14 @@
        <h4>{updateData.title}</h4>
 
        <f:format.raw>{updateData.wizardHtml}</f:format.raw>
-
-       <fieldset>
-               <ol>
-                       <li class="t3-install-form-label-after">
+       <div class="form-group">
+               <div class="checkbox">
+                       <label>
                                <input id="t3-install-showdatabasequeries" type="checkbox" name="install[values][showDatabaseQueries]" value="1" />
-                               <label for="t3-install-showdatabasequeries">Show database queries performed</label>
-                       </li>
-               </ol>
-       </fieldset>
+                               Show database queries performed
+                       </label>
+               </div>
+       </div>
 
        <f:render
                partial="Action/Common/SubmitButton"
index 29e276f..9e2b2a6 100644 (file)
                                <h4>{availableUpdate.title}</h4>
                                <f:format.raw>{availableUpdate.explanation}</f:format.raw>
                                <f:if condition="{availableUpdate.renderNext}">
-                                       <f:render
-                                               partial="Action/Common/SubmitButton"
-                                               arguments="{name:'getUserInput', text:'Execute'}"
-                                       />
+                                       <div>
+                                               <f:render
+                                                       partial="Action/Common/SubmitButton"
+                                                       arguments="{name:'getUserInput', text:'Execute'}"
+                                               />
+                                       </div>
                                </f:if>
                                <hr />
                        </form>
@@ -36,6 +38,6 @@
        When all updates are done you can check the database for tables and fields no longer required.
        Perform the Database Analyzer steps until no more changes are required.
 </p>
-<a href="Install.php?install[action]=importantActions&amp;install[context]={context}&amp;install[controller]=tool">
+<a href="Install.php?install[action]=importantActions&amp;install[context]={context}&amp;install[controller]=tool" class="btn btn-default">
        Go to Database Analyzer
 </a>
index 692c249..c0ef76a 100644 (file)
@@ -2,23 +2,32 @@
 <html>
 <head>
        <title>The Access to the Install Tool blocked</title>
-       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/EarlyExit.css?{time}" />
+       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
 </head>
 <body>
-<div id="container">
-       <h1>TYPO3</h1>
-       <div class="typo3-message message-ok">
-               <h2>Thank you for downloading TYPO3</h2>
-               <p>
-                       To proceed with the installation, create the file <strong>FIRST_INSTALL</strong>
-                       in your root directory.
-                       The filename is case-sensitive but the file itself can be empty.
-               </p>
-
-               <p>
-                       <strong>Note:</strong>
-                       The file will be deleted once you proceed with the installation.
-               </p>
+<div class="container">
+       <div class="page-header">
+               <h1 class="logo-pageheader"><img src="../Resources/Public/Images/typo3_orange.svg" width="130" class="logo" /> <small> CMS {typo3Version}</small></h1>
+       </div>
+       <div class="row">
+               <div class="col-sm-12 col-md-6">
+                       <div class="panel panel-success">
+                               <div class="panel-heading">
+                                       <h2>Thank you for downloading TYPO3</h2>
+                               </div>
+                               <div class="panel-body">
+                                       <p>
+                                               To proceed with the installation, create the file <strong>FIRST_INSTALL</strong>
+                                               in your root directory.
+                                               The filename is case-sensitive but the file itself can be empty.
+                                       </p>
+                                       <p>
+                                               <strong>Note:</strong>
+                                               The file will be deleted once you proceed with the installation.
+                                       </p>
+                               </div>
+                       </div>
+               </div>
        </div>
 </div>
 </body>
index 31a695e..0d031f0 100644 (file)
@@ -2,27 +2,33 @@
 <html>
 <head>
        <title>The Install Tool is locked</title>
-       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/EarlyExit.css?{time}" />
+       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
 </head>
 <body>
-<div id="container">
-       <h1>TYPO3</h1>
+<div class="container">
+       <div class="page-header"><img src="../Resources/Public/Images/typo3_orange.svg" width="130" class="logo" /></div>
+       <div class="row">
+               <div class="col-sm-12 col-md-8 col-lg-5 center-block">
+                       <div class="panel panel-warning">
+                               <div class="panel-heading">
+                                       <h2 class="panel-title">The Install Tool is locked</h2>
+                               </div>
+                               <div class="panel-body">
+                                       <p>
+                                               To enable the Install Tool, the file <strong>ENABLE_INSTALL_TOOL</strong>
+                                               must be created in the directory <strong>typo3conf/</strong>.
+                                               The file must be writable by the web server user.
+                                               The filename is case-sensitive but the file itself can be empty.
+                                       </p>
 
-       <div class="typo3-message message-warning">
-               <h2>The Install Tool is locked</h2>
-
-               <p>
-                       To enable the Install Tool, the file <strong>ENABLE_INSTALL_TOOL</strong>
-                       must be created in the directory <strong>typo3conf/</strong>.
-                       The file must be writable by the web server user.
-                       The filename is case-sensitive but the file itself can be empty.
-               </p>
-
-               <p>
-                       <strong>Security note:</strong>
-                       When you are finished with the Install Tool, you should rename or delete this file.
-                       It will automatically be deleted if you log out of the Install Tool or if the file is older than one hour.
-               </p>
+                                       <p>
+                                               <strong>Security note:</strong>
+                                               When you are finished with the Install Tool, you should rename or delete this file.
+                                               It will automatically be deleted if you log out of the Install Tool or if the file is older than one hour.
+                                       </p>
+                               </div>
+                       </div>
+               </div>
        </div>
 </div>
 </body>
index 1edca01..13c2646 100644 (file)
@@ -1,22 +1,32 @@
 <!DOCTYPE html>
 <html>
 <head>
-       <title>No install tool password set</title>
-       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/EarlyExit.css?{time}" />
+       <title>The Access to the Install Tool blocked</title>
+       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
 </head>
 <body>
-<div id="container">
-       <h1>TYPO3</h1>
-       <div class="typo3-message message-warning">
-               <h2>No install tool password set</h2>
-               <p>
-                       No install tool password is set, access to install tool is denied for security reasons.
-               </p>
-               <p>
-                       The file typo3conf/LocalConfiguration.php does not contain a password for the install tool.
-                       This should have been set during installation. You can gain access to the install tool
-                       login form by setting ['BE']['installToolPassword'] to the MD5 hash of your chosen password.
-               </p>
+<div class="container">
+       <div class="page-header">
+               <h1 class="logo-pageheader"><img src="../Resources/Public/Images/typo3_orange.svg" width="130" class="logo" /> <small> CMS {typo3Version}</small></h1>
+       </div>
+       <div class="row">
+               <div class="col-sm-12 col-md-6">
+                       <div class="panel panel-warning">
+                               <div class="panel-heading">
+                                       <h2>No install tool password set</h2>
+                               </div>
+                               <div class="panel-body">
+                                       <p>
+                                               No install tool password is set, access to install tool is denied for security reasons.
+                                       </p>
+                                       <p>
+                                               The file typo3conf/LocalConfiguration.php does not contain a password for the install tool.
+                                               This should have been set during installation. You can gain access to the install tool
+                                               login form by setting ['BE']['installToolPassword'] to the MD5 hash of your chosen password.
+                                       </p>
+                               </div>
+                       </div>
+               </div>
        </div>
 </div>
 </body>
index 7fbb378..bb9aa17 100644 (file)
@@ -12,7 +12,7 @@
 <head>
        <title>Install tool login</title>
        <f:render partial="Action/Common/Headers" arguments="{_all}" />
-       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/Login.css?{time}" />
+       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/InstallTool.css?{time}" />
 </head>
 <body class="{context}">
        <f:if condition="{contextService.backendContext}">
index 83f2eec..b05ae3e 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="Step" />
 
 <f:section name="Content">
-       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps}" />
+       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps, currentStep: currentStep}" />
 
        <h3>Database connection</h3>
 
index 308658f..7c49bb2 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="Step" />
 
 <f:section name="Content">
-       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps}" />
+       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps, currentStep: currentStep}" />
 
        <h3>Create user and import base data</h3>
 
                (default username is "admin").
        </p>
 
-       <form method="post" id="stepInstaller-databaseData" class="t3-install-form-label-before">
+       <form method="post" id="stepInstaller-databaseData" class="t3-install-form-label-before form-horizontal">
                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
                <input type="hidden" value="execute" name="install[set]" />
-
-               <fieldset class="t3-install-form-label-width-10">
-                       <ol>
-                               <li>
-                                       <label for="password">Username</label>
-                                       <input
-                                               class="t3-install-form-input-text"
+               <div class="form-group">
+                       <label for="password" class="control-label col-md-2">Username</label>
+                       <div class="col-md-10">
+                               <input
+                                               class="t3-install-form-input-text form-control"
                                                name="install[values][username]"
                                                id="username"
                                                placeholder="admin"
                                                autocomplete="off"
-                                       />
-                               </li>
-
-                               <li>
-                                       <label for="password">Password</label>
-                                       <input
-                                               class="t3-install-form-input-text t3-install-form-password-strength"
+                                               />
+                       </div>
+               </div>
+               <div class="form-group">
+                       <label for="password" class="control-label col-md-2">Password</label>
+                       <div class="col-md-10">
+                               <input
+                                               class="t3-install-form-input-text t3-install-form-password-strength form-control"
                                                name="install[values][password]"
                                                id="password"
                                                type="password"
                                                autocomplete="off"
-                                       />
-                               </li>
-
-                               <li>
-                                       <label for="show-password">Show password</label>
-                                       <input
-                                               type="checkbox"
-                                               id="show-password"
-                                               onchange="if (this.checked==true) { document.getElementById('password').type='text'; } else { document.getElementById('password').type='password'; }"
-                                       />
-                               </li>
-                       </ol>
-               </fieldset>
-               <div class="typo3-message message-warning">
-                       This password gives an attacker full control over your instance if cracked. It should be strong (include lower and upper case characters, special characters and numbers) and must be at least eight characters long.
+                                               />
+                       </div>
                </div>
-               <hr />
-
-               <fieldset class="t3-install-form-label-width-10">
-                       <ol>
-                               <li>
-                                       <label for="sitename">Site name</label>
-                                       <input
-                                               class="t3-install-form-input-text"
+               <div class="row">
+                       <div class="col-md-2"></div>
+                       <div class="col-md-10">
+                               <div class="checkbox">
+                                       <label>
+                                               <input
+                                                       type="checkbox"
+                                                       id="show-password"
+                                                       onchange="if (this.checked==true) { document.getElementById('password').type='text'; } else { document.getElementById('password').type='password'; }"
+                                               />
+                                               Show password
+                                       </label>
+                               </div>
+                       </div>
+               </div>
+               <div class="row">
+                       <div class="col-md-2"></div>
+                       <div class="col-md-10">
+                               <div class="alert alert-warning">
+                                       This password gives an attacker full control over your instance if cracked. It should be strong (include lower and upper case characters, special characters and numbers) and must be at least eight characters long.
+                               </div>
+                       </div>
+               </div>
+               <div class="form-group">
+                       <label for="sitename" class="control-label col-md-2">Site name</label>
+                       <div class="col-md-10">
+                               <input
+                                               class="t3-install-form-input-text form-control"
                                                name="install[values][sitename]"
                                                id="sitename"
                                                type="text"
                                                value="{siteName}"
-                                       />
-                               </li>
-                       </ol>
-               </fieldset>
-
+                                               />
+                       </div>
+               </div>
                <button class="btn btn-default" type="submit">
                        Continue
                </button>
index 74773b6..7aeefd1 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="Step" />
 
 <f:section name="Content">
-       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps}" />
+       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps, currentStep: currentStep}" />
 
        <h3>Select database</h3>
 
                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
                <input type="hidden" value="execute" name="install[set]" />
 
-               <fieldset>
+               <f:if condition="{isInitialInstallationInProgress}">
 
-                       <f:if condition="{isInitialInstallationInProgress}">
-
-                               <f:then>
-                                       <f:comment>
-                                               First installation
-                                       </f:comment>
-                                       <ul>
-                                               <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">Use an existing empty database:</label>
-                                                               <select
-                                                                       id="t3-install-step-database-existing"
-                                                                       name="install[values][existing]"
-                                                                       onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
-                                                               >
-                                                                       <option value="">-- Select database --</option>
-                                                                       <f:for each="{databaseList}" as="database">
-                                                                               <f:if condition="{database.tables}">
-                                                                                       <f:then>
-                                                                                               <option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
-                                                                                       </f:then>
-                                                                                       <f:else>
-                                                                                               <option value="{database.name}">{database.name}</option>
-                                                                                       </f:else>
-                                                                               </f:if>
-                                                                       </f:for>
-                                                               </select>
-                                                       </div>
-                                               </li>
-                                               <li>
-                                                       <input
+                       <f:then>
+                               <f:comment>
+                                       First installation
+                               </f:comment>
+                               <div class="radio">
+                                       <label for="t3-install-form-db-select-type-existing">
+                                               <input id="t3-install-form-db-select-type-existing" type="radio" name="install[values][type]" value="existing" class="radio" checked="checked" />
+                                               Use an existing empty database:
+                                       </label>
+                               </div>
+                               <div class="form-group">
+                                       <select
+                                                       id="t3-install-step-database-existing"
+                                                       name="install[values][existing]"
+                                                       class="form-control"
+                                                       onfocus="document.getElementById('t3-install-form-db-select-type-existing').checked=true;"
+                                                       >
+                                               <option value="">-- Select database --</option>
+                                               <f:for each="{databaseList}" as="database">
+                                                       <f:if condition="{database.tables}">
+                                                               <f:then>
+                                                                       <option value="{database.name}" disabled="disabled">{database.name} ({database.tables} Tables)</option>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       <option value="{database.name}">{database.name}</option>
+                                                               </f:else>
+                                                       </f:if>
+                                               </f:for>
+                                       </select>
+                               </div>
+                               <div class="radio">
+                                       <label for="t3-install-step-database-new">
+                                               <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">OR 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>
-
-                               <f:else>
-                                       <f:comment>
-                                               Upgrading
-                                       </f:comment>
+                                               OR create a new database:</label>
+                               </div>
+                               <div class="form-group">
+                                       <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-form-db-select-type-existing"
-                                               type="hidden"
-                                               name="install[values][type]"
-                                               value="existing"
+                                               id="t3-install-step-database-new"
+                                               class="t3-install-form-input-text form-control"
+                                               type="text"
+                                               name="install[values][new]"
+                                               checked="checked"
+                                               onfocus="document.getElementById('t3-install-form-db-select-type-new').checked=true;"
                                        />
-                                       <div>
-                                               <label for="t3-install-step-database-existing">Select an existing database:</label>
-                                               <p>The database will not be altered in any way.</p>
-                                               <select
-                                                       id="t3-install-step-database-existing"
-                                                       name="install[values][existing]"
-                                                       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>
-                                               </select>
-                                       </div>
-                               </f:else>
-
-                       </f:if>
+                               </div>
+                       </f:then>
 
-               </fieldset>
+                       <f:else>
+                               <f:comment>
+                                       Upgrading
+                               </f:comment>
+                               <input
+                                       id="t3-install-form-db-select-type-existing"
+                                       type="hidden"
+                                       name="install[values][type]"
+                                       value="existing"
+                               />
+                               <div class="">
+                                       <label for="t3-install-step-database-existing">Select an existing database:</label>
+                                       <p>The database will not be altered in any way.</p>
+                                       <select
+                                               id="t3-install-step-database-existing"
+                                               name="install[values][existing]"
+                                               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>
+                                       </select>
+                               </div>
+                       </f:else>
 
-               <button class="btn btn-default" type="submit">
-                       Continue
-               </button>
+               </f:if>
+               <div class="form-group">
+                       <button class="btn btn-default" type="submit">
+                               Continue
+                       </button>
+               </div>
        </form>
 </f:section>
\ No newline at end of file
index a2434d1..ea8721b 100644 (file)
@@ -3,46 +3,51 @@
 <f:layout name="Step" />
 
 <f:section name="Content">
-       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps}" />
+       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps, currentStep: currentStep}" />
 
        <h3>Installation done!</h3>
 
-       <p>
+       <div class="alert alert-success">
                The only thing remaining is to set some configuration values based on your
                system environment, which happens automatically in this step.
                Then you will be redirected to your TYPO3 CMS backend, ready for you to log in
                with the user you just created.
-       </p>
+       </div>
 
-       <h4>Want a pre-configured site?</h4>
-       <p>
-               You now have an empty installation. If you want a pre-configured site, there are
-               distributions on the web which can be installed via the Extension Manager.
-               If you check the option below, the list of distributions will be fetched and you will
-               be able to choose one directly.
-               <strong>Please note: This may take some time after login.</strong>
-       </p>
+       <div class="alert alert-notice">
+               <h4>Want a pre-configured site?</h4>
+               <p>
+                       You now have an empty installation. If you want a pre-configured site, there are
+                       distributions on the web which can be installed via the Extension Manager.
+                       If you check the option below, the list of distributions will be fetched and you will
+                       be able to choose one directly.
+                       <strong>Please note: This may take some time after login.</strong>
+               </p>
+       </div>
 
        <form method="post">
                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
                <input type="hidden" value="execute" name="install[set]" />
-               <fieldset class="t3-install-form-label-after">
-                       <ol>
-                               <li>
+               <div class="form-group">
+                       <div class="radio">
+                               <label for="load-distributions">
                                        <input type="radio" id="load-distributions" name="install[values][sitesetup]" value="loaddistribution" />
-                                       <label for="load-distributions">Yes, download the list of distributions.</label>
-                               </li>
-                               <li>
+                                       Yes, download the list of distributions.
+                               </label>
+                       </div>
+                       <div class="radio">
+                               <label for="create-site">
                                        <input type="radio" id="create-site" name="install[values][sitesetup]" value="createsite" />
-                                       <label for="create-site">Yes, create a base empty page to start from.</label>
-                               </li>
-                               <li>
+                                       Yes, create a base empty page to start from.
+                               </label>
+                       </div>
+                       <div class="radio">
+                               <label for="do-nothing">
                                        <input type="radio" id="do-nothing" name="install[values][sitesetup]" value="donothing" checked="checked" />
-                                       <label for="do-nothing">Do nothing, just get me to the Backend.</label>
-                               </li>
-                       </ol>
-               </fieldset>
-               <hr />
+                                       Do nothing, just get me to the Backend.
+                               </label>
+                       </div>
+               </div>
                <button class="btn btn-default" type="submit">
                        Open the backend
                </button>
index 917c661..e858696 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="Step" />
 
 <f:section name="Content">
-       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps}" />
+       <f:render partial="Action/Step/StepCounter.html" arguments="{steps: steps, currentStep: currentStep}" />
 
        <h3>System environment check</h3>
 
index 7636d57..01f2444 100644 (file)
@@ -5,14 +5,14 @@
 <f:section name="Content">
        <f:if condition="{contextService.standaloneContext}">
                <f:then>
-                       <h3>About</h3>
+                       <h1>About</h1>
                </f:then>
                <f:else>
-                       <h3>TYPO3 CMS {typo3Version} Install tool on site: {siteName}
+                       <h1>TYPO3 CMS {typo3Version} Install tool on site: {siteName}
                </f:else>
        </f:if>
 
-       <h4>How to configure TYPO3 CMS</h4>
+       <h3>How to configure TYPO3 CMS</h3>
        <p>
                Local configuration is done by overriding default values in the
                file typo3conf/LocalConfiguration.php. The options that you
@@ -31,7 +31,7 @@
        <hr />
 
 
-       <h4>Using this script</h4>
+       <h3>Using this script</h3>
        <p>
                These are the primary steps for you to take:
        </p>
        <hr />
 
 
-       <h4>Header legend</h4>
-       <h4 class="typo3-message message-notice">
-               Notice!
-       </h4>
-       <p>
-               Indicates that something is important to be aware of.
-               <br />
-               This does <em>not</em> indicate an error.
-       </p>
+       <h3>Header legend</h3>
+       <div class="alert alert-notice">
+               <h4 class="typo3-message message-notice">
+                       Notice!
+               </h4>
+               <p class="messageText">
+                       Indicates that something is important to be aware of.
+                       <br />
+                       This does <em>not</em> indicate an error.
+               </p>
+       </div>
 
-       <h4 class="typo3-message message-information">
-               Just information
-       </h4>
-       <p>
-               This is a simple message with some information about something.
-       </p>
+       <div class="alert alert-info">
+               <h4 class="typo3-message message-information">
+                       Just information
+               </h4>
+               <p>
+                       This is a simple message with some information about something.
+               </p>
+       </div>
 
-       <h4 class="typo3-message message-ok">
+       <div class="alert alert-success">
+               <h4 class="typo3-message message-ok">
                Check was successful
        </h4>
-       <p>
+       <p class="messageText">
                Indicates that something was checked and returned an expected result.
-       </p>
+       </p></div>
 
-       <h4 class="typo3-message message-warning">
+       <div class="alert alert-warning"><h4 class="typo3-message message-warning">
                Warning!
        </h4>
-       <p>
+       <p class="messageText">
                Indicates that something may very well cause trouble
                and you should definitely look into it before proceeding.
                <br />
                This indicates a <em>potential</em> error.
-       </p>
+       </p></div>
 
-       <h4 class="typo3-message message-error">
+       <div class="alert alert-danger"><h4 class="typo3-message message-error">
                Error!
        </h4>
-       <p>
+       <p class="messageText">
                Indicates that something is definitely wrong and that TYPO3 will most
                likely not perform as expected if this problem is not solved.
                <br />
                This indicates an actual error.
-       </p>
-</f:section>
\ No newline at end of file
+       </p></div>
+       <div class="row copyright">
+               <hr>
+               <div class="panel panel-default">
+                       <div class="panel-body">
+                               <f:render partial="Action/Common/Copyright" arguments="{_all}" />
+                       </div>
+               </div>
+       </div>
+</f:section>
index 88292f3..4d23814 100644 (file)
@@ -6,7 +6,7 @@
 
        <f:if condition="{configurationValuesSaved}">
                <f:then>
-                       <h3>Saved configuration values</h3>
+                       <h1>Saved configuration values</h1>
 
                        <f:if condition="{savedConfigurationValueMessages}">
                                <f:then>
                </f:then>
 
                <f:else>
-                       <h3>Change configuration values</h3>
+                       <div class="fixedHead">
+                               <h1>Change configuration values</h1>
 
-                       <p>
-                               Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php
-                               is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
-                               must maintain AdditionalConfiguration.php on their own and should use it with care.
-                       </p>
+                               <p>
+                                       Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php
+                                       is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
+                                       must maintain AdditionalConfiguration.php on their own and should use it with care.
+                               </p>
+                               <div class="form-group">
+                                       <div class="input-group">
+                                               <span class="input-group-addon">Filter by:</span>
+                                               <input type="text" class="form-control" placeholder="search setting" id="configSearch">
+                                       </div>
+                               </div>
+                       </div>
 
                        <form method="post">
                                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
-
-
-
+                               <div class="panel-group" id="allConfiguration" role="tablist" aria-multiselectable="true">
                                <f:for each="{data}" as="sectionData" key="sectionName">
                                        <f:if condition="{sectionData}">
                                                <f:render partial="Action/Tool/AllConfiguration/SubSection" arguments="{_all}" />
                                        </f:if>
                                </f:for>
+                               </div>
 
                                <div id="fixed-footer-handler">
                                        <div id="fixed-footer">
-                                               <f:render partial="Action/Common/SubmitButton" arguments="{name:'write', text:'Write configuration', className:'btn-save'}"/>
-                                               <div class="toggleAll button">Toggle All</div>
+                                               <div class="footer-innerWrap">
+                                                       <f:render partial="Action/Common/SubmitButton" arguments="{name:'write', text:'Write configuration', className:'btn-save'}"/>
+                                               </div>
                                        </div>
                                </div>
                        </form>
index e605130..3b486d1 100644 (file)
@@ -3,22 +3,67 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Clean up your installation</h3>
-
+       <h1>Clean up your installation</h1>
        <f:for each="{actionMessages}" as="statusMessage">
                <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
        </f:for>
 
-       <f:render partial="Action/Tool/CleanUp/Typo3TempFiles" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/CleanUp/ProcessedFiles" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/CleanUp/ClearTables" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/CleanUp/ResetBackendUserUc" arguments="{_all}" />
-       <hr />
-
+       <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingOne">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                                               Clean typo3temp/ folder
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseOne" class="panel-collapse collapse {f:if(condition:'{postAction} == \'deleteTypo3TempFiles\'', then:'in')}" role="tabpanel" aria-labelledby="headingOne">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/CleanUp/Typo3TempFiles" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingTwo">
+                               <h4 class="panel-title">
+                                       <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+                                               Clear processed files
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseTwo" class="panel-collapse collapse {f:if(condition:'{postAction} == \'clearProcessedFiles\'', then:'in')}"" role="tabpanel" aria-labelledby="headingTwo">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/CleanUp/ProcessedFiles" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingThree">
+                               <h4 class="panel-title">
+                                       <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+                                               Clear tables
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseThree" class="panel-collapse collapse {f:if(condition:'{postAction} == \'clearTables\'', then:'in')}"" role="tabpanel" aria-labelledby="headingThree">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/CleanUp/ClearTables" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingFour">
+                               <h4 class="panel-title">
+                                       <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
+                                               Reset backend user preferences
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseFour" class="panel-collapse collapse {f:if(condition:'{postAction} == \'resetBackendUserUc\'', then:'in')}"" role="tabpanel" aria-labelledby="headingFour">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/CleanUp/ResetBackendUserUc" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+       </div>
 </f:section>
index 39bb94c..de9e4c3 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Configuration presets</h3>
+       <h1>Configuration presets</h1>
 
        <f:for each="{actionMessages}" as="statusMessage">
                <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
                is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
                must maintain AdditionalConfiguration.php on their own and should use it with care.
        </p>
-       <form method="post">
+       <form method="post" class="form-horizontal">
                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
 
-               <f:for each="{features}" as="feature">
-                       <f:render partial="Action/Tool/Configuration/{feature.name}" arguments="{_all}" />
-               </f:for>
+               <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+                       <f:for each="{features}" as="feature">
+                               <f:render partial="Action/Tool/Configuration/{feature.name}" arguments="{_all}" />
+                       </f:for>
+               </div>
 
                <div id="fixed-footer-handler">
                        <div id="fixed-footer">
-                               <f:render partial="Action/Common/SubmitButton" arguments="{name:'activate', text:'Activate', className:'btn-save'}"/>
-                               <div class="toggleAll button">Toggle All</div>
+                               <div class="footer-innerWrap">
+                                       <f:render partial="Action/Common/SubmitButton" arguments="{name:'activate', text:'Activate', className:'btn-save'}"/>
+                               </div>
                        </div>
                </div>
 
index a84336d..d971c67 100644 (file)
@@ -3,12 +3,12 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Folder Structure</h3>
+       <h1>Folder Structure</h1>
        <p>Root Directory: <strong><i:constant name="PATH_site" /></strong></p>
 
        <f:if condition="{fixedStatus}">
                <hr />
-               <h4>Fix action results:</h4>
+               <h3>Fix action results:</h3>
                <f:for each="{fixedStatus}" as="statusMessage">
                        <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
                </f:for>
@@ -16,7 +16,7 @@
 
        <f:if condition="{errorStatus}">
                <hr />
-               <h4>These files or folders have errors and may be fixed automatically:</h4>
+               <h3>These files or folders have errors and may be fixed automatically:</h3>
                <f:for each="{errorStatus}" as="statusMessage">
                        <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
                </f:for>
        </f:if>
 
        <hr />
-       <h4>Default File and Directory permissions</h4>
+       <h3>Default File and Directory permissions</h3>
        <f:render partial="Action/Common/StatusMessage" arguments="{message: filePermissionStatus}" />
        <f:render partial="Action/Common/StatusMessage" arguments="{message: directoryPermissionStatus}" />
 
        <f:if condition="{okStatus}">
                <hr />
-               <h4>These structures don't need to be fixed:</h4>
+               <h3>These structures don't need to be fixed:</h3>
                <f:for each="{okStatus}" as="statusMessage">
                        <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
                </f:for>
        </f:if>
-</f:section>
\ No newline at end of file
+</f:section>
index 3520b42..0304331 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Important actions</h3>
+       <h1>Important actions</h1>
 
        <f:for each="{actionMessages}" as="statusMessage">
                <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
index 6e23e11..d48498f 100644 (file)
@@ -1,7 +1,7 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Load extension configuration</h3>
+       <h1>Load extension configuration</h1>
 
        <f:for each="{actionMessages}" as="statusMessage">
                <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
@@ -20,8 +20,8 @@
        <script type="text/javascript">
                $(function() {
                        $('button', '#checkExtensions').hide();
-                       $('.typo3-message', '#checkExtensions').hide();
-                       $('.message-loading', '#checkExtensions').show();
+                       $('.t3js-message', '#checkExtensions').hide();
+                       $('.t3js-message-loading', '#checkExtensions').show();
                        TYPO3.Install.ExtensionChecker.checkExtensionsCompatibility(true);
                });
        </script>
index fcc8298..787ad93 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>System environment check</h3>
+       <h1>System environment check</h1>
 
        <f:for each="{statusObjectsBySeverity}" as="statusMessages">
                <f:for each="{statusMessages}" as="statusMessage">
                </f:for>
        </f:for>
 
-       <div class="toggleGroup phpinfo">
-               <div class="toggleButton">
-                       <h4>PHP Info</h4>
-               </div>
-
-               <div class="toggleData" style="display:none">
-                       <div class="toggleDataContent">
+       <a class="btn btn-default" role="button" data-toggle="collapse" href="#phpinfo" aria-expanded="false">
+               Show PHP Info
+       </a>
+       <div class="collapse" id="phpinfo">
+               <div class="panel panel-default">
+                       <div class="panel-body">
                                <i:phpInfo />
                        </div>
                </div>
        </div>
-</f:section>
\ No newline at end of file
+</f:section>
index 5118dac..c3f87e1 100644 (file)
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Test system settings</h3>
-
+       <h1>Test system settings</h1>
        <f:for each="{actionMessages}" as="statusMessage">
                <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
        </f:for>
-
-       <f:render partial="Action/Tool/TestSetup/Mail" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/TestSetup/TrueTypeFont" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/TestSetup/ConvertImageFormatsToJpg" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/TestSetup/WriteGifAndPng" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/TestSetup/ScalingImages" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/TestSetup/CombiningImages" arguments="{_all}" />
-       <hr />
-
-       <f:render partial="Action/Tool/TestSetup/Gdlib" arguments="{_all}" />
-       <hr />
-</f:section>
\ No newline at end of file
+       <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingOne">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                                               Mail setup
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseOne" class="panel-collapse collapse {f:if(condition:'{postAction} == \'testMail\'', then:'in')}" role="tabpanel" aria-labelledby="headingOne">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/Mail" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingTwo">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="true" aria-controls="collapseTwo">
+                                               True type font settings
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseTwo" class="panel-collapse collapse {f:if(condition:'{trueTypeFontTested}', then:'in')}" role="tabpanel" aria-labelledby="headingTwo">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/TrueTypeFont" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingThree">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
+                                               Convert image formats to jpg
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseThree" class="panel-collapse collapse {f:if(condition:'{convertImageFormatsToJpgTested}', then:'in')}" role="tabpanel" aria-labelledby="headingThree">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/ConvertImageFormatsToJpg" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingFour">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
+                                               Writing gif and png
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseFour" class="panel-collapse collapse {f:if(condition:'{writeGifAndPngTested}', then:'in')}" role="tabpanel" aria-labelledby="headingFour">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/WriteGifAndPng" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingFive">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
+                                               Scaling images
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseFive" class="panel-collapse collapse {f:if(condition:'{scalingImagesTested}', then:'in')}" role="tabpanel" aria-labelledby="headingFive">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/ScalingImages" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingSix">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSix" aria-expanded="true" aria-controls="collapseSix">
+                                               Combining images
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseSix" class="panel-collapse collapse {f:if(condition:'{combiningImagesTested}', then:'in')}" role="tabpanel" aria-labelledby="headingSix">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/CombiningImages" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+               <div class="panel panel-default">
+                       <div class="panel-heading" role="tab" id="headingSeven">
+                               <h4 class="panel-title">
+                                       <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSeven" aria-expanded="true" aria-controls="collapseSeven">
+                                               GDlib
+                                       </a>
+                               </h4>
+                       </div>
+                       <div id="collapseSeven" class="panel-collapse collapse {f:if(condition:'{gdlibTested}', then:'in')}" role="tabpanel" aria-labelledby="headingSeven">
+                               <div class="panel-body">
+                                       <f:render partial="Action/Tool/TestSetup/Gdlib" arguments="{_all}" />
+                               </div>
+                       </div>
+               </div>
+       </div>
+</f:section>
index 21a3679..96ed3bd 100644 (file)
@@ -3,7 +3,7 @@
 <f:layout name="ToolAuthenticated" />
 
 <f:section name="Content">
-       <h3>Upgrade Wizard</h3>
+       <h1>Upgrade Wizard</h1>
 
        <f:for each="{actionMessages}" as="statusMessage">
                <f:render partial="Action/Common/StatusMessage" arguments="{message: statusMessage}" />
@@ -22,4 +22,4 @@
                <f:render partial="Action/Tool/UpgradeWizard/PerformUpdate" arguments="{_all}" />
        </f:if>
 
-</f:section>
\ No newline at end of file
+</f:section>
diff --git a/typo3/sysext/install/Resources/Public/Css/Action/Common/EarlyExit.css b/typo3/sysext/install/Resources/Public/Css/Action/Common/EarlyExit.css
deleted file mode 100644 (file)
index 6da5517..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-@charset "UTF-8";
-
-body {
-       /* Font size 62.8% = 1em = 10px */
-       font: 62.8% Verdana, Arial, Helvetica, sans-serif;
-       padding-top: 11em;
-       background: #4f4f4f;
-}
-
-h1 {
-       background: url('../../../Images/Background/Logo.gif') no-repeat scroll 0 0 transparent;
-       text-indent: -999em;
-       display: block;
-       height: 34px;
-       margin: 0 0 1.85em;
-}
-
-h2 {
-       margin-top: 0;
-}
-
-#container {
-       margin: 0 auto;
-       width: 41em;
-       font-size: 110%;
-       line-height: 1.7em;
-       max-width: 100%;
-}
-
-.typo3-message {
-       background-position: 1.2em 1.8em;
-       background-repeat: no-repeat;
-       border: 1px solid;
-       color: #9e7d4a;
-       padding: 1.5em 1.5em 1em 3.5em;
-}
-
-.message-warning {
-       background-image: url("../../../Images/Icon/Warning.png");
-       background-color: #fbf6de;
-       border-color: #b1905c;
-}
-
-.message-ok {
-       background-image: url("../../../Images/Icon/Ok.png");
-       background-color: #79a548;
-       border-color: transparent;
-       color: #fff;
-}
-
-.typo3-message ul {
-       padding-left: 20px;
-}
diff --git a/typo3/sysext/install/Resources/Public/Css/Action/Common/Install.css b/typo3/sysext/install/Resources/Public/Css/Action/Common/Install.css
deleted file mode 100644 (file)
index e9fbd1d..0000000
+++ /dev/null
@@ -1,937 +0,0 @@
-@charset "UTF-8";
-
-/* http://meyerweb.com/eric/tools/css/reset/ */
-/* v1.0 | 20080212 */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend
-table, caption, tbody, tfoot, thead, tr, th, td {
-       margin: 0;
-       padding: 0;
-       border: 0;
-       outline: 0;
-       font-size: 100%;
-       vertical-align: baseline;
-       background: transparent;
-}
-body {
-       line-height: 1;
-}
-body.standalone {
-       overflow-y: scroll;
-}
-body.backend #typo3-docbody {
-       overflow-y: scroll;
-}
-ol, ul {
-       list-style: none;
-}
-blockquote, q {
-       quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-       content: none;
-}
-
-/* remember to define focus styles! */
-:focus {
-       outline: 0;
-}
-
-/* remember to highlight inserts somehow! */
-ins {
-       text-decoration: none;
-}
-del {
-       text-decoration: line-through;
-}
-
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-       border-collapse: collapse;
-       border-spacing: 0;
-}
-
-
-body {
-       font: 75% Verdana, Arial, Helvetica, sans-serif;
-}
-
-pre {
-       font-size: 1.2em;
-       margin: 1em 1em;
-}
-
-code {
-       font-size: 1.2em;
-}
-
-p, form, fieldset, h3, h4, h5, h6, dl {
-       margin: 1em 0 1em 0;
-}
-
-ol, ul {
-       margin: 1em 0 1em 1.5em;
-       padding: 0 0 0 1em;
-}
-
-ul {
-       list-style: disc;
-}
-
-ol {
-       list-style: decimal;
-}
-
-dl dd {
-       margin-left: 1.5em;
-}
-
-fieldset li p {
-       margin-top: 0;
-}
-
-h2 {
-       margin: 2.5em 0 1.7em 0.8em;
-       color: #585858;
-       font-size: 120%;
-       font-weight: bold;
-}
-
-h3 {
-       font-size: 140%;
-       margin: 0.7em 0 1.5em
-}
-
-h4 {
-       font-size: 110%;
-       margin: 1.5em 0 1.2em;
-}
-
-.clearfix:after {
-       content: ".";
-       display: block;
-       height: 0;
-       clear: both;
-       visibility: hidden;
-}
-
-* html .clearfix {
-       height: 1%;
-}
-
-legend {
-       margin-left: 1em;
-       font-weight: bold;
-}
-
-fieldset ol {
-       margin: 0;
-       padding: 0;
-       list-style: none;
-}
-
-fieldset li {
-       margin-bottom: 0.5em;
-       float: left;
-       clear: left;
-       width: 100%;
-}
-
-label {
-       float: left;
-       width: 18em;
-       margin-right: 1em;
-       padding: 0.2em 0;
-}
-
-fieldset span {
-       float: left;
-       width: 29em;
-}
-
-.t3-install-form-label-after input {
-       float: left;
-}
-
-.t3-install-form-label-after label,
-.t3-install-form-label-above label {
-       float: none;
-       display: block;
-       width: auto;
-       margin-right: 0;
-}
-
-.t3-install-form-label-above label {
-       margin-bottom: 0.5em;
-}
-
-.t3-install-form-label-after label {
-       padding-left: 2em;
-}
-
-.t3-install-form-label-width-7 label {
-       width: 7em;
-}
-
-.t3-install-form-label-width-21 label {
-       width: 21em;
-}
-
-.t3-install-form-label-after input[type=checkbox] {
-       margin-top: 0.7em;
-}
-
-fieldset.t3-install-form-submit {
-       float: none;
-       width: auto;
-}
-
-.t3-install-login fieldset.t3-install-form-submit {
-       margin-left: 8em;
-}
-
-fieldset select,
-input.t3-install-form-input-text,
-textarea {
-       border: 1px solid #7c7c7c;
-       color: #000000;
-       font-size: 1.1em;
-       line-height: 1.7em;
-       margin: 0;
-       width: 20em;
-}
-
-fieldset select {
-       height: 2em;
-       padding: 0.2em;
-       width: 17.4em;
-}
-
-input.t3-install-form-input-text {
-       height: 1.7em;
-       padding: 0.1em 0.1em 0 0.45em;
-}
-
-textarea {
-       width: 99%;
-       font-size: 1.2em;
-}
-
-button,
-.button {
-       color: #606060;
-       font-size: 1.1em;
-       padding: 0.3em 0.6em;
-       border: 1px solid #7c7c7c;
-       background-color: #f6f6f6;
-       background: -moz-linear-gradient(top,  #f6f6f6 0%, #dadada 100%);
-       background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#dadada));
-       background: -webkit-linear-gradient(top,  #f6f6f6 0%,#dadada 100%);
-       background: -o-linear-gradient(top,  #f6f6f6 0%,#dadada 100%);
-       background: -ms-linear-gradient(top,  #f6f6f6 0%,#dadada 100%);
-       background: linear-gradient(to bottom,  #f6f6f6 0%,#dadada 100%);
-       cursor: pointer;
-}
-
-button:hover,
-.button:hover {
-       background-color: #ededed;
-       background: -moz-linear-gradient(top,  #f6f6f6 0%, #aaa 100%);
-       background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f6f6f6), color-stop(100%,#aaa));
-       background: -webkit-linear-gradient(top,  #f6f6f6 0%,#aaa 100%);
-       background: -o-linear-gradient(top,  #f6f6f6 0%,#aaa 100%);
-       background: -ms-linear-gradient(top,  #f6f6f6 0%,#aaa 100%);
-       background: linear-gradient(to bottom,  #f6f6f6 0%,#aaa 100%);
-}
-
-button span {
-       background-repeat: no-repeat;
-       display: inline-block;
-       width: 16px;
-       height: 16px;
-       margin-left: 0.6em;
-       float: none;
-}
-
-button span.t3-install-form-button-icon-negative {
-       background-image: url('../../../Images/Icon/Error.png');
-}
-
-.t3-install-hidden {
-       display: none;
-}
-
-.t3-install-strong {
-       font-weight: bold;
-}
-
-#t3-install-outer {
-       width: 78em;
-       margin: 1em auto;
-}
-
-#t3-install-head {
-       position: fixed;
-}
-
-#t3-install-logo {
-       width: 21em;
-       float: left;
-       height: 100px;
-}
-
-#t3-install-headline {
-       width: 57em;
-       float: left;
-}
-
-#t3-install-center {
-       position: absolute;
-       clear: both;
-}
-
-.standalone #t3-install-center {
-       top: 100px;
-}
-
-#t3-install-left {
-       width: 21em;
-       position: fixed;
-}
-
-#t3-install-right {
-       padding-left: 21em;
-       margin-bottom: 1em;
-       width: 57em;
-}
-
-#t3-install-menu {
-       margin: 0;
-       padding: 0;
-       list-style: none;
-       width: 18em;
-       font-size: 110%;
-       line-height: 2em;
-}
-
-#t3-install-menu li {
-      &n