[TASK] Install Tool re-order menu items 02/28002/4
authorWouter Wolters <typo3@wouterwolters.nl>
Mon, 3 Mar 2014 19:50:26 +0000 (20:50 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 4 Mar 2014 11:28:47 +0000 (12:28 +0100)
Current Order:

* Welcome
* Important actions
* System environment
* Configuration Presets
* Folder structure
* Test setup
* Upgrade Wizard
* All configuration
* Clean up
* Logout from Install Tool

New proposed order:

* Important Actions
* Configuration Presets
* All Configuration
* Upgrade Wizard
* System environment
* Folder Structure
* Test Setup
* Cleanup

"Logout" is put below the menu as a link and "Welcome"
is just the first screen but without any menu item for it.

Resolves: #56497
Releases: 6.2
Change-Id: I20a3c363e5039b875c0aef2d23353f981dabee6b
Reviewed-on: https://review.typo3.org/28002
Reviewed-by: Ernesto Baschny
Tested-by: Ernesto Baschny
Reviewed-by: Jan Helke
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/install/Resources/Private/Partials/Action/Common/Left.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/Welcome.html
typo3/sysext/install/Resources/Public/Images/Menu/Logout.gif [deleted file]
typo3/sysext/install/Resources/Public/Stylesheets/Action/Common/Install.css

index 1f93b9a..3b25790 100644 (file)
@@ -1,15 +1,25 @@
 <div id="t3-install-left">
        <ol id="t3-install-menu">
-               <li id="t3-install-menu-welcome" class="{f:if(condition:'{action} == \'welcome\'', then:'act')}">
-                       <a href="Install.php?install[action]=welcome&install[context]={context}&install[controller]=tool">
-                               Welcome
-                       </a>
-               </li>
                <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
                                </f:if>
                        </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-folderStructure" class="{f:if(condition:'{action} == \'folderStructure\'', then:'act')}">
                        <a href="Install.php?install[action]=folderStructure&install[context]={context}&install[controller]=tool">
                                Folder structure
                                Test setup
                        </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-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-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-logout">
-                       <a href="Install.php?install[action]=logout&install[context]={context}&install[controller]=tool">
-                               Logout from Install Tool
-                       </a>
+       </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">
index 71969fc..11983e4 100644 (file)
                </ul>
        </p>
        <p>
-               <strong>2: 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>3: Configuration presets</strong>
+               <strong>2: Configuration presets</strong>
                <br />
                The following configuration preset groups are available here:
                <ul>
                </ul>
        </p>
        <p>
-               <strong>4: Folder structure</strong>
+               <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>5: Test setup</strong>
+               <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>
                </ul>
        </p>
        <p>
-               <strong>6: 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>7: All configuration</strong>
-               <br />
-               In this step you can change the configuration values of your TYPO3 CMS installation.
-       </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
diff --git a/typo3/sysext/install/Resources/Public/Images/Menu/Logout.gif b/typo3/sysext/install/Resources/Public/Images/Menu/Logout.gif
deleted file mode 100644 (file)
index 03417a7..0000000
Binary files a/typo3/sysext/install/Resources/Public/Images/Menu/Logout.gif and /dev/null differ
index c10bdfa..140122d 100644 (file)
@@ -384,8 +384,27 @@ button span.t3-install-form-button-icon-negative {
        background-image: url('../../../Images/Menu/Welcome.png');
 }
 
-#t3-install-menu #t3-install-menu-logout {
-       background-image: url('../../../Images/Menu/Logout.gif');
+#t3-install-menu-logout {
+       margin: 2em 0 0 0.8em;
+       padding: 0;
+       list-style: none;
+       width: 18em;
+       font-size: 110%;
+       line-height: 2em;
+}
+
+#t3-install-menu-logout li {
+       padding: 0.35em 0 0.35em 0;
+}
+
+#t3-install-menu-logout a {
+       color: #606060;
+       text-decoration: none;
+}
+
+body.standalone #t3-install-menu-logout a {
+       color: #797878;
+       text-decoration: none;
 }
 
 #t3-install-menu .t3-install-menu-errorCount {