[TASK] Info>Localization overview: Solve double edit icon 45/36245/4
authorMichael Oehlhof <typo3@oehlhof.de>
Sun, 25 Jan 2015 00:23:36 +0000 (01:23 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 26 Jan 2015 00:07:17 +0000 (01:07 +0100)
Remove the edit icon for "edit page".
Put the "edit page" link on the page title.

Resolves: #63221
Releases: master
Change-Id: Ie41e3d8db908d5d538240d092617076602da354a
Reviewed-on: http://review.typo3.org/36245
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php

index 35f8a78..79007f9 100644 (file)
@@ -110,7 +110,11 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                        // Page icons / titles etc.
                        $tCells[] = '<td' . ($data['row']['_CSSCLASS'] ? ' class="' . $data['row']['_CSSCLASS'] . '"' : '') . '>' .
                                $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($data['HTML'], 'pages', $data['row']['uid']) .
+                               '<a href="#" onclick="' . htmlspecialchars(
+                                       'top.loadEditId(' . (int)$data['row']['uid'] . ',"&SET[language]=0"); return false;'
+                               ) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPage') . '">' .
                                htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($data['row']['title'], $titleLen)) .
+                               '</a>' .
                                ((string)$data['row']['nav_title'] !== '' ? ' [Nav: <em>' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($data['row']['nav_title'], $titleLen)) . '</em>]' : '') .
                                '</td>';
                        // DEFAULT language:
@@ -129,10 +133,6 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                ) . '" title="' . $GLOBALS['LANG']->sL(
                                        'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editDefaultLanguagePage'
                                ) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>';
-                       $info .= '<a href="#" onclick="' . htmlspecialchars(
-                                       'top.loadEditId(' . (int)$data['row']['uid'] . ',"&SET[language]=0"); return false;'
-                               ) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPage') . '">' .
-                               IconUtility::getSpriteIcon('actions-page-open') . '</a>';
                        $info .= str_replace('###LANG_UID###', '0', $viewPageLink);
                        $info .= '&nbsp;';
                        $info .= $data['row']['l18n_cfg'] & 1 ? '<span title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_tca.xlf:pages.l18n_cfg.I.1', TRUE) . '">D</span>' : '&nbsp;';
@@ -164,7 +164,12 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                                        ) . '</em>]' : '') . ($row['_COUNT'] > 1 ? '<div>' . $GLOBALS['LANG']->sL(
                                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_badThingThereAre'
                                                        ) . '</div>' : '');
-                                               $tCells[] = '<td class="' . $status . ' col-border-left">' . $info . '</td>';
+                                               $tCells[] = '<td class="' . $status . ' col-border-left">' .
+                                                       '<a href="#" onclick="' . htmlspecialchars(
+                                                               'top.loadEditId(' . (int)$data['row']['uid'] . ',"&SET[language]=' . $langRow['uid'] . '"); return false;'
+                                                       ) . '" title="' . $GLOBALS['LANG']->sL(
+                                                               'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPageLang'
+                                                       ) . '">' . $info . '</a></td>';
                                                // Edit whole record:
                                                $info = '';
                                                $editUid = $row['uid'];
@@ -174,11 +179,6 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                                        ) . '" title="' . $GLOBALS['LANG']->sL(
                                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editLanguageOverlayRecord'
                                                        ) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>';
-                                               $info .= '<a href="#" onclick="' . htmlspecialchars(
-                                                               'top.loadEditId(' . (int)$data['row']['uid'] . ',"&SET[language]=' . $langRow['uid'] . '"); return false;'
-                                                       ) . '" title="' . $GLOBALS['LANG']->sL(
-                                                               'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPageLang'
-                                                       ) . '">' . IconUtility::getSpriteIcon('actions-page-open') . '</a>';
                                                $info .= str_replace('###LANG_UID###', $langRow['uid'], $viewPageLink);
                                                $tCells[] = '<td class="' . $status . '">' . $info . '</td>';
                                                $tCells[] = '<td class="' . $status . '" title="' . $GLOBALS['LANG']->sL(