Skip to content

Commit

Permalink
[TASK] Unify layout of tables in submodules
Browse files Browse the repository at this point in the history
Use the same layout for tables in submodules of module 'Info'.

Resolves: #81457
Releases: master
Change-Id: I1135bbf57eaa033fd09538c242192907b5b20ee4
Reviewed-on: https://review.typo3.org/53479
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Joerg Boesche <typo3@joergboesche.de>
Tested-by: Joerg Boesche <typo3@joergboesche.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
  • Loading branch information
Jasmina Ließmann authored and andreaskienast committed Feb 7, 2018
1 parent 755205b commit e993d07
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
4 changes: 0 additions & 4 deletions Build/Resources/Public/Sass/typo3/_element_tree.scss
Expand Up @@ -371,10 +371,6 @@ span.dragIcon {

//
// Info Pagetree Overview
[id=InfoModuleController] a.btn-default {
margin-right: 5px;
}

[id=InfoModuleController] a.t3js-contextmenutrigger {
margin-right: 4px;
}
25 changes: 17 additions & 8 deletions typo3/sysext/backend/Classes/View/PageLayoutView.php
Expand Up @@ -1738,12 +1738,12 @@ public function pages_drawItem($row, $fieldArr)
switch ($field) {
case 'title':
$pTitle = htmlspecialchars(BackendUtility::getProcessedValue('pages', $field, $row[$field], 20));
$theData[$field] = $row['treeIcons'] . $theIcon . $pTitle . '&nbsp;&nbsp;';
$theData[$field] = $row['treeIcons'] . $theIcon . $pTitle;
break;
case 'php_tree_stop':
// Intended fall through
case 'TSconfig':
$theData[$field] = $row[$field] ? '&nbsp;<strong>x</strong>' : '&nbsp;';
$theData[$field] = $row[$field] ? '<strong>x</strong>' : '&nbsp;';
break;
case 'uid':
if ($this->getBackendUser()->doesUserHaveAccess($row, 2) && $row['uid'] > 0) {
Expand All @@ -1757,13 +1757,22 @@ public function pages_drawItem($row, $fieldArr)
];
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$url = (string)$uriBuilder->buildUriFromRoute('record_edit', $urlParameters);
$eI = '<a class="btn btn-default" href="' . htmlspecialchars($url)
. '" title="' . htmlspecialchars($this->getLanguageService()->getLL('editThisPage')) . '">'
. $this->iconFactory->getIcon('actions-page-open', Icon::SIZE_SMALL)->render() . '</a>';
$onClick = BackendUtility::viewOnClick($row['uid'], '', BackendUtility::BEgetRootLine($row['uid']));

$eI =
'<a href="#" onclick="' . htmlspecialchars($onClick) . '" class="btn btn-default" title="' .
$this->getLanguageService()->sL('LLL:EXT:frontend/Resources/Private/Language/locallang_webinfo.xlf:lang_renderl10n_viewPage') . '">' .
$this->iconFactory->getIcon('actions-view-page', Icon::SIZE_SMALL)->render() .
'</a>';
$eI .=
'<a class="btn btn-default" href="' . htmlspecialchars($url) . '" title="' .
htmlspecialchars($this->getLanguageService()->getLL('editThisPage')) . '">' .
$this->iconFactory->getIcon('actions-page-open', Icon::SIZE_SMALL)->render() .
'</a>';
} else {
$eI = '';
}
$theData[$field] = $eI . '<span align="right">' . $row['uid'] . '</span>';
$theData[$field] = '<div class="btn-group" role="group">' . $eI . '</div>';
break;
case 'shortcut':
case 'shortcut_mode':
Expand All @@ -1776,7 +1785,7 @@ public function pages_drawItem($row, $fieldArr)
$f2 = substr($field, 6);
if ($GLOBALS['TCA'][$f2]) {
$c = $this->numberOfRecords($f2, $row['uid']);
$theData[$field] = '&nbsp;&nbsp;' . ($c ? $c : '');
$theData[$field] = ($c ? $c : '');
}
} else {
$theData[$field] = $this->getPagesTableFieldValue($field, $row);
Expand All @@ -1797,7 +1806,7 @@ public function pages_drawItem($row, $fieldArr)
*/
protected function getPagesTableFieldValue($field, array $row)
{
return '&nbsp;&nbsp;' . htmlspecialchars(BackendUtility::getProcessedValue('pages', $field, $row[$field]));
return htmlspecialchars(BackendUtility::getProcessedValue('pages', $field, $row[$field]));
}

/**********************************
Expand Down
2 changes: 1 addition & 1 deletion typo3/sysext/backend/Resources/Public/Css/backend.css

Large diffs are not rendered by default.

0 comments on commit e993d07

Please sign in to comment.