[TASK] Clean-up EXT: aboutmodules, adapt to "TYPO3 CMS"
authorFelix Kopp <felix-source@phorax.com>
Sun, 14 Oct 2012 14:31:37 +0000 (16:31 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 19 Oct 2012 14:11:14 +0000 (16:11 +0200)
Cleans up the About Modules CSS file (mainly paddings) and terminology
to distinct between "TYPO3" (Association) and "TYPO3 CMS" product
within copyright notices.

Standardize CSS ids to use the extension key (aboutmodules).
Also adds links to the module descriptions to jump to module.
Brings one further logo image to comply with new brand definition.

Only applies to the extbase version of AboutModules.

Resolves: #41980
Releases: 6.0, 4.7
Change-Id: Iba088c5d644dfc048ea9c65e72711d501b51ae59
Reviewed-on: http://review.typo3.org/15610
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/gfx/loginlogo_transp.gif
typo3/sysext/aboutmodules/Classes/Controller/ModulesController.php
typo3/sysext/aboutmodules/Resources/Private/Layouts/Default.html
typo3/sysext/aboutmodules/Resources/Private/Templates/Modules/Index.html
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/lang/locallang_alt_intro.xlf
typo3/sysext/lang/locallang_login.xlf
typo3/sysext/t3skin/stylesheets/structure/module_help_about_module.css
typo3/sysext/t3skin/stylesheets/visual/module_help_about_module.css
typo3/sysext/t3skin/templates/errorpage-message.html

index 286c151..0b0e6a0 100755 (executable)
Binary files a/typo3/gfx/loginlogo_transp.gif and b/typo3/gfx/loginlogo_transp.gif differ
index cc1e692..210531e 100644 (file)
@@ -44,7 +44,14 @@ class ModulesController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControll
         * @return void
         */
        public function indexAction() {
-               $this->view->assign('TYPO3Version', TYPO3_version)->assign('copyRightNotice', \TYPO3\CMS\Backend\Utility\BackendUtility::TYPO3_copyRightNotice())->assign('warningMessages', \TYPO3\CMS\Backend\Utility\BackendUtility::displayWarningMessages())->assign('modules', $this->getModulesData());
+               $this->view->assignMultiple(
+                       array(
+                               'TYPO3Version' => TYPO3_version,
+                               'copyRightNotice' => \TYPO3\CMS\Backend\Utility\BackendUtility::TYPO3_copyRightNotice(),
+                               'warningMessages' => \TYPO3\CMS\Backend\Utility\BackendUtility::displayWarningMessages(),
+                               'modules' => $this->getModulesData()
+                       )
+               );
        }
 
        /**
index a3ffebf..d0c742d 100644 (file)
@@ -5,7 +5,7 @@
        </div>
 
        <div id="typo3-docbody">
-               <div id="typo3-alt-intro-php-sub">
+               <div id="typo3-inner-docbody" class="typo3-aboutmodules-inner-docbody">
                        <f:render section="Content" />
                </div>
        </div>
index 51c0c0e..72a0f46 100644 (file)
@@ -1,7 +1,7 @@
 <f:layout name="Default" />
 
 <f:section name="Content">
-       <h1>TYPO3 {TYPO3Version}<br />
+       <h1>TYPO3 CMS {TYPO3Version}<br />
                <f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:introtext" />
        </h1>
 
                <f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:introtext2" />
        </h3>
 
-       <table border="0" cellpadding="0" cellspacing="0" id="typo3-about-modules">
+       <table border="0" cellpadding="0" cellspacing="0" id="typo3-aboutmodules">
                <tbody>
                        <f:for each="{modules}" as="mainModule">
                                <tr class="c-mainitem">
                                        <td colspan="3">
-                                               <f:image src="{mainModule.icon}" alt="" />
-                                               &nbsp;
                                                <f:if condition="{mainModules.subModules -> f:count()} > 0">
                                                        <f:then>
-                                                               <strong>{mainModule.label}</strong>
+                                                               <h3><f:image src="{mainModule.icon}" alt="" /> {mainModule.label}</h3>
                                                        </f:then>
                                                        <f:else>
-                                                               <a
-                                                                       href="#"
-                                                                       onclick="top.goToModule('{mainModule.name}'); return false;"
-                                                               >
-                                                                       <strong>{mainModule.label}</strong>
-                                                               </a>
+                                                               <h3>
+                                                                       <a href="#" onclick="top.goToModule('{mainModule.name}'); return false;">
+                                                                               <f:image src="{mainModule.icon}" alt="" />
+                                                                       </a>
+
+                                                                       <a href="#" onclick="top.goToModule('{mainModule.name}'); return false;">
+                                                                               {mainModule.label}
+                                                                       </a>
+                                                               </h3>
                                                        </f:else>
                                                </f:if>
                                        </td>
                                        </f:if>
 
                                        <tr class="c-subitem-row">
-                                               <td align="center">
-                                                       <f:image src="{subModule.icon}" alt="" />
+                                               <td>
+                                                       <a
+                                                               href="#"
+                                                               onclick="top.goToModule('{mainModule.name}_{subModule.name}'); return false;"
+                                                               title="{subModule.shortDescription}"
+                                                       >
+                                                               <f:image src="{subModule.icon}" alt="{subModule.label}" />
+                                                       </a>
                                                </td>
                                                <td>
                                                        <a
                                                        </a>
                                                </td>
                                                <td class="module-description">
-                                                       <strong>
-                                                               {subModule.shortDescription}
-                                                       </strong>
-                                                       <br />
+                                                       <f:if condition="{subModule.shortDescription}">
+                                                               <strong>
+                                                                       <a
+                                                                               href="#"
+                                                                               onclick="top.goToModule('{mainModule.name}'); return false;"
+                                                                               title="{subModule.shortDescription}"
+                                                                       >
+                                                                               {subModule.shortDescription}
+                                                                       </a>
+                                                               </strong>
+                                                               <br />
+                                                       </f:if>
+
                                                        {subModule.longDescription -> f:format.raw()}
                                                </td>
                                        </tr>
@@ -73,7 +89,7 @@
 
        <br />
 
-       <p class="c-features">
+       <p>
                <em>
                        (<f:translate key="LLL:EXT:lang/locallang_alt_intro.xlf:endText" />)
                </em>
index 6cdd03b..3bdf8ac 100644 (file)
@@ -3773,7 +3773,12 @@ class BackendUtility {
        /**
         * Prints TYPO3 Copyright notice for About Modules etc. modules.
         *
-        * @return void
+        * Warning:
+        * DO NOT prevent this notice from being shown in ANY WAY.
+        * According to the GPL license an interactive application must show such a notice on start-up ('If the program is interactive, make it output a short notice... ' - see GPL.txt)
+        * Therefore preventing this notice from being properly shown is a violation of the license, regardless of whether you remove it or use a stylesheet to obstruct the display.
+        *
+        * @return string Text/Image (HTML) for copyright notice.
         */
        static public function TYPO3_copyRightNotice() {
                // Copyright Notice
@@ -3784,7 +3789,17 @@ class BackendUtility {
                } else {
                        $warrantyNote = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:no.warranty'), '<a href="' . TYPO3_URL_LICENSE . '" target="_blank">', '</a>');
                }
-               $cNotice = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/loginlogo_transp.gif', 'width="75" height="19" vspace="2" hspace="4"') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '" align="left" />' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.cms') . ' ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:version.short') . ' ' . htmlspecialchars(TYPO3_version) . '</a>. ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:copyright') . ' &copy; ' . htmlspecialchars(TYPO3_copyright_year) . ' Kasper Sk&aring;rh&oslash;j. ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:extension.copyright') . ' ' . sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:details.link'), ('<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . TYPO3_URL_GENERAL . '</a>')) . ' ' . strip_tags($warrantyNote, '<a>') . ' ' . sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:free.software'), ('<a href="' . TYPO3_URL_LICENSE . '" target="_blank">'), '</a> ') . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:keep.notice');
+               $cNotice = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' .
+                               '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/loginlogo_transp.gif', 'width="75" height="24" vspace="2" hspace="4"') . ' alt="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '" align="left" />' .
+                               $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.cms') . ' ' .
+                               $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:version.short') . ' ' .
+                               htmlspecialchars(TYPO3_version) . '</a>. ' .
+                               $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:copyright') . ' &copy; ' . htmlspecialchars(TYPO3_copyright_year) . ' Kasper Sk&aring;rh&oslash;j. ' .
+                               $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:extension.copyright') . ' ' .
+                               sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:details.link'), ('<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . TYPO3_URL_GENERAL . '</a>')) . ' ' .
+                               strip_tags($warrantyNote, '<a>') . ' ' .
+                               sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:free.software'), ('<a href="' . TYPO3_URL_LICENSE . '" target="_blank">'), '</a> ') .
+                               $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:keep.notice');
                return $cNotice;
        }
 
index 4fd3e64..c87d5c1 100644 (file)
@@ -7,7 +7,7 @@
                                <source>Web Content Management System</source>
                        </trans-unit>
                        <trans-unit id="introtext2" xml:space="preserve">
-                               <source>This is a brief description of the available modules:</source>
+                               <source>This is a brief description of the available modules.</source>
                        </trans-unit>
                        <trans-unit id="endText" xml:space="preserve">
                                <source>Features may vary depending on your website and permissions</source>
index ef681b0..fe5c335 100644 (file)
@@ -46,7 +46,7 @@
                                <source>Traditional Backend</source>
                        </trans-unit>
                        <trans-unit id="headline" xml:space="preserve">
-                               <source>Login to the TYPO3 Backend on ###SITENAME###</source>
+                               <source>Login to the TYPO3 CMS Backend on ###SITENAME###</source>
                        </trans-unit>
                        <trans-unit id="info.about" xml:space="preserve">
                                <source>This is the backend login of TYPO3. You need username and password to access this administration interface. If you are a visitor of ###SITENAME###, please visit the public website: ###SITELINK###</source>
                                <source>Warranty is supplied by %s; %sclick for details.%s</source>
                        </trans-unit>
                        <trans-unit id="no.warranty" xml:space="preserve">
-                               <source>TYPO3 comes with ABSOLUTELY NO WARRANTY; %sclick for details.%s</source>
+                               <source>TYPO3 CMS comes with ABSOLUTELY NO WARRANTY; %sclick for details.%s</source>
                        </trans-unit>
                        <trans-unit id="typo3.logo" xml:space="preserve">
                                <source>TYPO3 logo</source>
index 610030e..d44ff82 100644 (file)
@@ -1,45 +1,35 @@
 /* - - - - - - - - - - - - - - - - - - - - -
-Help > About modules (alt_intro.php)
+Help > About modules
 
 - - - - - - - - - - - - - - - - - - - - - */
 
-div.typo3-alt-intro-php {
-       height: 100%;
-       overflow: auto;
-}
-
-#typo3-alt-intro-php-sub {
-       margin: 30px 20px;
+/** following div#typo3-inner-docbody */
+.typo3-aboutmodules-inner-docbody {
        width: 600px;
 }
 
-#typo3-alt-intro-php-sub p a img {
+/** TYPO3 logo floating in introduction text */
+.typo3-aboutmodules-inner-docbody p a img {
        margin-right: 8px;
        margin-bottom: 2px;
 }
 
-table#typo3-about-modules tr td {
-       padding: 2px 2px 2px 2px;
+table#typo3-aboutmodules tr td {
        vertical-align: top;
 }
 
-table#typo3-about-modules tr.c-mainitem td {
-       padding-top: 14px;
-}
-
-table#typo3-about-modules tr.c-mainitem:first-child td {
-       padding-top: 0;
+table#typo3-aboutmodules tr.c-mainitem td {
+       padding-top: 12px;
 }
 
-table#typo3-about-modules tr.c-mainitem td img {
-       padding: 0px 2px 2px 4px;
-       vertical-align: middle;
+table#typo3-aboutmodules tr.c-mainitem td img {
+       vertical-align: bottom;
 }
 
-table#typo3-about-modules tr.c-subitem-row td:first-child {
-       padding-left: 23px;
+table#typo3-aboutmodules tr.c-subitem-row td {
+       padding: 6px 6px 12px 6px;
 }
 
-table#typo3-about-modules tr.c-subitem-row td.module-description {
+table#typo3-aboutmodules tr.c-subitem-row td.module-description {
        padding-right: 10px;
 }
\ No newline at end of file
index 2ec79ff..a5d33d3 100644 (file)
@@ -1,28 +1,27 @@
 /* - - - - - - - - - - - - - - - - - - - - -
-Help > About modules (alt_intro.php)
+Help > About modules
 
 - - - - - - - - - - - - - - - - - - - - - */
 
-table#typo3-about-modules {
-       background: #ffffff;
+/** Styles for the modules listing table */
+
+table#typo3-aboutmodules {
        border-collapse: collapse;
 }
 
-table#typo3-about-modules tr.c-first td {
+table#typo3-aboutmodules tr.c-first td {
        border-top: 1px solid #ccc;
 }
 
-table#typo3-about-modules tr.c-endrow td {
+table#typo3-aboutmodules tr.c-endrow td {
+       background: #ffffff;
        border-bottom: 1px solid #ccc;
 }
 
-table#typo3-about-modules tr.c-first,
-table#typo3-about-modules tr.c-endrow,
-table#typo3-about-modules tr.c-subitem-row {
+table#typo3-aboutmodules tr.c-first,
+table#typo3-aboutmodules tr.c-endrow,
+table#typo3-aboutmodules tr.c-subitem-row {
+       background: #ffffff;
        border-left: 1px solid #ccc;
        border-right: 1px solid #ccc;
-}
-
-table#typo3-about-modules tr.c-mainitem {
-       background-color: #f8f8f8;
 }
\ No newline at end of file
index e623dc3..fb90d40 100644 (file)
@@ -27,9 +27,9 @@
 
 <div id="t3-footer">
        <div id="t3-copyright-notice">
-               TYPO3 is an open source content management system. To maintain the quality of the system and to improve it, please help us by donating.
-               TYPO3 CMS. Copyright © ###TYPO3_copyright_year### Kasper Skårhøj. Extensions are copyright of their respective owners. Go to http://typo3.org/ for details.
-               TYPO3 comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. Obstructing the appearance of this notice is prohibited by law.
+               TYPO3 CMS is an open source content management system. To maintain the quality of the system and to improve it, please help us by donating.
+               TYPO3 CMS. Copyright &copy; ###TYPO3_copyright_year### Kasper Skårhøj. Extensions are copyright of their respective owners. Go to http://typo3.org/ for details.
+               TYPO3 CMS comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions. Obstructing the appearance of this notice is prohibited by law.
        </div>
 </div>