[TASK] Install Tool - Change default action in Standalone context 05/43905/3
authorNicole Cordes <typo3@cordes.co>
Thu, 8 Oct 2015 09:45:38 +0000 (11:45 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 8 Oct 2015 18:31:37 +0000 (20:31 +0200)
This patch moves the welcome page to a new action "about" and integrates
it into the navigation. Furthermore the default action is changed
to "importantActions" as this is the most needed action when accessing
the Install Tool.

Resolves: #67080
Releases: master
Change-Id: I8cfe7a30e57668c3ef16987d08ed7611c741e874
Reviewed-on: http://review.typo3.org/43905
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/install/Classes/Controller/Action/Tool/About.php [new file with mode: 0644]
typo3/sysext/install/Classes/Controller/Action/Tool/Welcome.php [deleted file]
typo3/sysext/install/Classes/Controller/ToolController.php
typo3/sysext/install/Resources/Private/Partials/Action/Common/Left.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/About.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Action/Tool/Welcome.html [deleted file]
typo3/sysext/install/Resources/Public/Css/Action/Common/Install.css

diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/About.php b/typo3/sysext/install/Classes/Controller/Action/Tool/About.php
new file mode 100644 (file)
index 0000000..3e8bd3c
--- /dev/null
@@ -0,0 +1,33 @@
+<?php
+namespace TYPO3\CMS\Install\Controller\Action\Tool;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Install\Controller\Action;
+
+/**
+ * About page
+ */
+class About extends Action\AbstractAction {
+
+       /**
+        * Executes the tool
+        *
+        * @return string Rendered content
+        */
+       protected function executeAction() {
+               return $this->view->render();
+       }
+
+}
diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/Welcome.php b/typo3/sysext/install/Classes/Controller/Action/Tool/Welcome.php
deleted file mode 100644 (file)
index 3c204cc..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-namespace TYPO3\CMS\Install\Controller\Action\Tool;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Install\Controller\Action;
-
-/**
- * Welcome page
- */
-class Welcome extends Action\AbstractAction {
-
-       /**
-        * Executes the tool
-        *
-        * @return string Rendered content
-        */
-       protected function executeAction() {
-               return $this->view->render();
-       }
-
-}
index d831587..3cad956 100644 (file)
@@ -28,7 +28,6 @@ class ToolController extends AbstractController {
         * @var array List of valid action names that need authentication
         */
        protected $authenticationActions = array(
-               'welcome',
                'importantActions',
                'systemEnvironment',
                'configuration',
@@ -38,6 +37,7 @@ class ToolController extends AbstractController {
                'allConfiguration',
                'cleanUp',
                'loadExtensions',
+               'about',
        );
 
        /**
@@ -167,7 +167,7 @@ class ToolController extends AbstractController {
        protected function dispatchAuthenticationActions() {
                $action = $this->getAction();
                if ($action === '') {
-                       $action = 'welcome';
+                       $action = 'importantActions';
                }
                $this->validateAuthenticationAction($action);
                $actionClass = ucfirst($action);
index f099615..32a7a3b 100644 (file)
                                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>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Tool/About.html b/typo3/sysext/install/Resources/Private/Templates/Action/Tool/About.html
new file mode 100644 (file)
index 0000000..7636d57
--- /dev/null
@@ -0,0 +1,166 @@
+{namespace i=TYPO3\CMS\Install\ViewHelpers}
+
+<f:layout name="ToolAuthenticated" />
+
+<f:section name="Content">
+       <f:if condition="{contextService.standaloneContext}">
+               <f:then>
+                       <h3>About</h3>
+               </f:then>
+               <f:else>
+                       <h3>TYPO3 CMS {typo3Version} Install tool on site: {siteName}
+               </f:else>
+       </f:if>
+
+       <h4>How to configure TYPO3 CMS</h4>
+       <p>
+               Local configuration is done by overriding default values in the
+               file typo3conf/LocalConfiguration.php. The options that you
+               choose in the Install Tool will be saved in this file, such as database information
+               and values in the global array
+               TYPO3_CONF_VARS.
+               <br /><br />
+               If you wish to manually edit the file, the options in the TYPO3_CONF_VARS array
+               and how to use them for your own purposes are discussed in the base configuration file,
+               EXT:core/Configuration/DefaultConfiguration.php. This file sets up the default values,
+               then includes the LocalConfiguration.php file to override the default values.
+               <br />
+               See this page for more information about system requirements:
+               <a target="_blank" href="<i:constant name="TYPO3_URL_SYSTEMREQUIREMENTS" />"><i:constant name="TYPO3_URL_SYSTEMREQUIREMENTS" /></a>
+       </p>
+       <hr />
+
+
+       <h4>Using this script</h4>
+       <p>
+               These are the primary steps for you to take:
+       </p>
+       <p>
+               <strong>1: Important actions</strong>
+               <br />
+               This step provides an overview of the main system information
+               (operating system, PHP information and database).
+               <br />
+               The following actions are available here:
+               <ul>
+                       <li><strong>Database Analyzer</strong> - compares the database table and field definitions of the
+                               current database with the specification from all loaded extensions' ext_tables.sql files.</li>
+                       <li><strong>Clear all cache</strong> - works similar to the cache clearing in the backend, but
+                               takes a more straightforward approach and the according backend hooks are not executed.</li>
+                       <li><strong>Check for broken extensions</strong> - 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.</li>
+                       <li><strong>Core update</strong> - automatically update the TYPO3 CMS core to its latest bugfix
+                               release if certain criteria are met. <strong>Note:</strong> This is not supported on Windows hosts.</li>
+                       <li><strong>Change install tool password</strong></li>
+                       <li><strong>Change site name</strong></li>
+                       <li><strong>Change encryption key</strong></li>
+                       <li><strong>Create backend administrator user</strong> - you should use this function only if there
+                               are no admin users in the database, for instance if this is a blank database</li>
+               </ul>
+       </p>
+       <p>
+               <strong>2: Configuration presets</strong>
+               <br />
+               The following configuration preset groups are available here:
+               <ul>
+                       <li><strong>Character set conversion settings</strong> - charset conversion.</li>
+                       <li><strong>Development / Production settings</strong> - context can be defined with the environment
+                               variable "TYPO3_CONTEXT" which is usually set through your webserver configuration
+                               (e.g. in htaccess).</li>
+                       <li><strong>Image handling settings</strong> - this module detects the available image handling
+                               tools and configures the system.</li>
+                       <li><strong>Extbase object cache</strong> - choose between APC / Database cache backend</li>
+               </ul>
+       </p>
+       <p>
+               <strong>3: All configuration</strong>
+               <br />
+               In this step you can change the configuration values of your TYPO3 CMS installation.
+       </p>
+       <p>
+               <strong>4: Upgrade Wizard</strong>
+               <br />
+               If you upgrade your TYPO3 CMS installation from one version to another (e.g. 6.1 to 6.2),
+               then the Upgrade Wizards guide you through the necessary steps to upgrade your database records
+               or explicitly install extensions that ship with the latest TYPO3 CMS version.
+       </p>
+       <p>
+               <strong>5: System environment</strong>
+               <br />
+               In this step your system environment is checked. If there are any settings that will prevent TYPO3 CMS from
+               running correctly, you'll get warnings and errors with a description of the problem.
+       </p>
+       <p>
+               <strong>6: Folder structure</strong>
+               <br />
+               This step checks the folder structure of your TYPO3 CMS installation and fixes errors that you might have
+               with files or folders.
+       </p>
+       <p>
+               <strong>7: Test setup</strong>
+               <br />
+               This gives you a set of tests for your TYPO3 CMS installation in order to test system settings:
+               <ul>
+                       <li>Mail setup</li>
+                       <li>True type font settings</li>
+                       <li>Convert image formats to jpg</li>
+                       <li>Writing gif and png</li>
+                       <li>Scaling images</li>
+                       <li>Combining images</li>
+                       <li>GDlib</li>
+               </ul>
+       </p>
+       <p>
+               <strong>8: Clean up</strong>
+               <br />
+               Here you can clean up temporary files in the typo3temp/ folder and the database tables used for
+               caching. Furthermore you can reset the preferences of all backend users.
+       </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>
+
+       <h4 class="typo3-message message-information">
+               Just information
+       </h4>
+       <p>
+               This is a simple message with some information about something.
+       </p>
+
+       <h4 class="typo3-message message-ok">
+               Check was successful
+       </h4>
+       <p>
+               Indicates that something was checked and returned an expected result.
+       </p>
+
+       <h4 class="typo3-message message-warning">
+               Warning!
+       </h4>
+       <p>
+               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>
+
+       <h4 class="typo3-message message-error">
+               Error!
+       </h4>
+       <p>
+               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
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Tool/Welcome.html b/typo3/sysext/install/Resources/Private/Templates/Action/Tool/Welcome.html
deleted file mode 100644 (file)
index c967941..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-{namespace i=TYPO3\CMS\Install\ViewHelpers}
-
-<f:layout name="ToolAuthenticated" />
-
-<f:section name="Content">
-       <f:if condition="{contextService.standaloneContext}">
-               <f:then>
-                       <h3>Welcome</h3>
-               </f:then>
-               <f:else>
-                       <h3>TYPO3 CMS {typo3Version} Install tool on site: {siteName}
-               </f:else>
-       </f:if>
-
-       <h4>How to configure TYPO3 CMS</h4>
-       <p>
-               Local configuration is done by overriding default values in the
-               file typo3conf/LocalConfiguration.php. The options that you
-               choose in the Install Tool will be saved in this file, such as database information
-               and values in the global array
-               TYPO3_CONF_VARS.
-               <br /><br />
-               If you wish to manually edit the file, the options in the TYPO3_CONF_VARS array
-               and how to use them for your own purposes are discussed in the base configuration file,
-               EXT:core/Configuration/DefaultConfiguration.php. This file sets up the default values,
-               then includes the LocalConfiguration.php file to override the default values.
-               <br />
-               See this page for more information about system requirements:
-               <a target="_blank" href="<i:constant name="TYPO3_URL_SYSTEMREQUIREMENTS" />"><i:constant name="TYPO3_URL_SYSTEMREQUIREMENTS" /></a>
-       </p>
-       <hr />
-
-
-       <h4>Using this script</h4>
-       <p>
-               These are the primary steps for you to take:
-       </p>
-       <p>
-               <strong>1: Important actions</strong>
-               <br />
-               This step provides an overview of the main system information
-               (operating system, PHP information and database).
-               <br />
-               The following actions are available here:
-               <ul>
-                       <li><strong>Database Analyzer</strong> - compares the database table and field definitions of the
-                               current database with the specification from all loaded extensions' ext_tables.sql files.</li>
-                       <li><strong>Clear all cache</strong> - works similar to the cache clearing in the backend, but
-                               takes a more straightforward approach and the according backend hooks are not executed.</li>
-                       <li><strong>Check for broken extensions</strong> - 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.</li>
-                       <li><strong>Core update</strong> - automatically update the TYPO3 CMS core to its latest bugfix
-                               release if certain criteria are met. <strong>Note:</strong> This is not supported on Windows hosts.</li>
-                       <li><strong>Change install tool password</strong></li>
-                       <li><strong>Change site name</strong></li>
-                       <li><strong>Change encryption key</strong></li>
-                       <li><strong>Create backend administrator user</strong> - you should use this function only if there
-                               are no admin users in the database, for instance if this is a blank database</li>
-               </ul>
-       </p>
-       <p>
-               <strong>2: Configuration presets</strong>
-               <br />
-               The following configuration preset groups are available here:
-               <ul>
-                       <li><strong>Character set conversion settings</strong> - charset conversion.</li>
-                       <li><strong>Development / Production settings</strong> - context can be defined with the environment
-                               variable "TYPO3_CONTEXT" which is usually set through your webserver configuration
-                               (e.g. in htaccess).</li>
-                       <li><strong>Image handling settings</strong> - this module detects the available image handling
-                               tools and configures the system.</li>
-                       <li><strong>Extbase object cache</strong> - choose between APC / Database cache backend</li>
-               </ul>
-       </p>
-       <p>
-               <strong>3: All configuration</strong>
-               <br />
-               In this step you can change the configuration values of your TYPO3 CMS installation.
-       </p>
-       <p>
-               <strong>4: Upgrade Wizard</strong>
-               <br />
-               If you upgrade your TYPO3 CMS installation from one version to another (e.g. 6.1 to 6.2),
-               then the Upgrade Wizards guide you through the necessary steps to upgrade your database records
-               or explicitly install extensions that ship with the latest TYPO3 CMS version.
-       </p>
-       <p>
-               <strong>5: System environment</strong>
-               <br />
-               In this step your system environment is checked. If there are any settings that will prevent TYPO3 CMS from
-               running correctly, you'll get warnings and errors with a description of the problem.
-       </p>
-       <p>
-               <strong>6: Folder structure</strong>
-               <br />
-               This step checks the folder structure of your TYPO3 CMS installation and fixes errors that you might have
-               with files or folders.
-       </p>
-       <p>
-               <strong>7: Test setup</strong>
-               <br />
-               This gives you a set of tests for your TYPO3 CMS installation in order to test system settings:
-               <ul>
-                       <li>Mail setup</li>
-                       <li>True type font settings</li>
-                       <li>Convert image formats to jpg</li>
-                       <li>Writing gif and png</li>
-                       <li>Scaling images</li>
-                       <li>Combining images</li>
-                       <li>GDlib</li>
-               </ul>
-       </p>
-       <p>
-               <strong>8: Clean up</strong>
-               <br />
-               Here you can clean up temporary files in the typo3temp/ folder and the database tables used for
-               caching. Furthermore you can reset the preferences of all backend users.
-       </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>
-
-       <h4 class="typo3-message message-information">
-               Just information
-       </h4>
-       <p>
-               This is a simple message with some information about something.
-       </p>
-
-       <h4 class="typo3-message message-ok">
-               Check was successful
-       </h4>
-       <p>
-               Indicates that something was checked and returned an expected result.
-       </p>
-
-       <h4 class="typo3-message message-warning">
-               Warning!
-       </h4>
-       <p>
-               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>
-
-       <h4 class="typo3-message message-error">
-               Error!
-       </h4>
-       <p>
-               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
index 612127c..e9fbd1d 100644 (file)
@@ -390,7 +390,7 @@ button span.t3-install-form-button-icon-negative {
        background-image: url('../../../Images/Menu/CleanUp.png');
 }
 
-#t3-install-menu #t3-install-menu-welcome a {
+#t3-install-menu #t3-install-menu-about a {
        background-image: url('../../../Images/Menu/Welcome.png');
 }