From 287d6c7c5b99bccac56a34883a8db4d19e468ab6 Mon Sep 17 00:00:00 2001
From: Felix Kopp <felix-source@phorax.com>
Date: Mon, 12 Aug 2013 10:02:53 +0200
Subject: [PATCH] [FEATURE] Intgrate CSS class "lead" for introductions
The most relevant text should always be highly visible.
Integrate the CSS class "lead" for introductions.
Lead brings a slightly larger font size and should be used
for the first short introduction text only.
"Lead" is a semantical annotation.
Follow-ups: Bring lead texts for all backend modules.
Change-Id: I10305c2d2ed66526d7e882aceff17b5d317cfbb3
Resolves: #51022
Releases: 6.2
Reviewed-on: https://review.typo3.org/23050
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
---
.../Classes/Controller/HelpModuleController.php | 13 ++++---------
.../Controller/IndexingStatisticsController.php | 11 +++++++++--
.../Classes/View/DatabaseIntegrityView.php | 16 ++++++++++++----
.../Controller/RecyclerModuleController.php | 2 +-
.../reports/Classes/Report/Status/Status.php | 2 +-
.../Private/Templates/Report/Detail.html | 1 -
typo3/sysext/reports/Resources/Public/styles.css | 5 -----
.../Controller/SchedulerModuleController.php | 7 ++++---
.../stylesheets/structure/main_content.css | 2 ++
9 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
index a1812a61cf0a..86f36bdfb5c5 100644
--- a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
+++ b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
@@ -257,18 +257,13 @@ class HelpModuleController {
$this->render_TOC_el($cshKey, 'other', $outputSections, $tocArray, $CSHkeys);
}
}
+
// COMPILE output:
$output = '';
- $output .= '
-
- <h1>' . $GLOBALS['LANG']->getLL('manual_title', TRUE) . '</h1>';
- $output .= '
-
- <h2>' . $GLOBALS['LANG']->getLL('introduction', TRUE) . '</h2>
- <p>' . $GLOBALS['LANG']->getLL('description', TRUE) . '</p>';
- $output .= '
+ $output .= '<h1>' . $GLOBALS['LANG']->getLL('manual_title', TRUE) . '</h1>';
+ $output .= '<p class="lead">' . $GLOBALS['LANG']->getLL('description', TRUE) . '</p>';
- <h2>' . $GLOBALS['LANG']->getLL('TOC', TRUE) . '</h2>' . $this->render_TOC_makeTocList($tocArray);
+ $output .= '<h2>' . $GLOBALS['LANG']->getLL('TOC', TRUE) . '</h2>' . $this->render_TOC_makeTocList($tocArray);
if (!$this->renderALL) {
$output .= '
<br/>
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
index 5904b91e5bef..ee9f0286b8bf 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
@@ -57,17 +57,24 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
*/
public function showStats() {
$conf['words'] = 50;
+
// max words in result list
$conf['bid'] = intval(\TYPO3\CMS\Core\Utility\GeneralUtility::_GET('id'));
+
// pageid for several statistics
$addwhere1 = '';
+
// all records
$addwhere2 = ' AND tstamp > ' . ($GLOBALS['EXEC_TIME'] - 30 * 24 * 60 * 60);
+
// last 30 days
$addwhere3 = ' AND tstamp > ' . ($GLOBALS['EXEC_TIME'] - 24 * 60 * 60);
+
// last 24 hours
- $content = $GLOBALS['LANG']->getLL('title2') . '
- <table cellpading="5" cellspacing="5" valign="top"><tr><td valign="top">' . $this->listSeveralStats($GLOBALS['LANG']->getLL('all'), $addwhere1, $conf) . '</td><td valign="top">' . $this->listSeveralStats($GLOBALS['LANG']->getLL('last30days'), $addwhere2, $conf) . '</td><td valign="top">' . $this->listSeveralStats($GLOBALS['LANG']->getLL('last24hours'), $addwhere3, $conf) . '</td></tr></table>' . $this->note;
+ $content = '<p class="lead">' . $GLOBALS['LANG']->getLL('title2') . '</p>';
+ $content .= '<table cellpading="5" cellspacing="5" valign="top" class=""><tr><td valign="top">' . $this->listSeveralStats($GLOBALS['LANG']->getLL('all'), $addwhere1, $conf) . '</td><td valign="top">' . $this->listSeveralStats($GLOBALS['LANG']->getLL('last30days'), $addwhere2, $conf) . '</td><td valign="top">' . $this->listSeveralStats($GLOBALS['LANG']->getLL('last24hours'), $addwhere3, $conf) . '</td></tr></table>';
+ $content .= '<p>' . $this->note . '</p>';
+
// Ask hook to include more on the page:
if ($hookObj = $this->hookRequest('additionalSearchStat')) {
$content .= $hookObj->additionalSearchStat();
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index f2609cc5fb8e..21bf07e3ad82 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -333,17 +333,25 @@ class DatabaseIntegrityView {
// Output content:
$this->content .= $this->doc->section('', str_replace(LF, '<br/>', $bodyContent), FALSE, TRUE);
}
+
// Output content:
- $content = '<p>' . $GLOBALS['LANG']->getLL('referenceIndex_description') . '</p><br />';
+ $content = '<p class="lead">' . $GLOBALS['LANG']->getLL('referenceIndex_description') . '</p>';
$content .= '<input type="submit" name="_check" value="' . $GLOBALS['LANG']->getLL('referenceIndex_buttonCheck') . '" /> <input type="submit" name="_update" value="' . $GLOBALS['LANG']->getLL('referenceIndex_buttonUpdate') . '" /><br /><br />';
$this->content .= $this->doc->section('', $content, FALSE, TRUE);
+
// Command Line Interface
$content = '';
$content .= '<p>' . $GLOBALS['LANG']->getLL('checkScript') . '</p>';
- $content .= '<h4>' . $GLOBALS['LANG']->getLL('checkScript_check_description') . '</h4>' . '<code>php ' . PATH_typo3 . 'cli_dispatch.phpsh lowlevel_refindex -c</code><br />';
- $content .= '<h4>' . $GLOBALS['LANG']->getLL('checkScript_update_description') . '</h4>' . '<code>php ' . PATH_typo3 . 'cli_dispatch.phpsh lowlevel_refindex -e</code><br /><br />';
+
+ $content .= '<h3>' . $GLOBALS['LANG']->getLL('checkScript_check_description') . '</h3>';
+ $content .= '<p><code>php ' . PATH_typo3 . 'cli_dispatch.phpsh lowlevel_refindex -c</code></p>';
+
+ $content .= '<h3>' . $GLOBALS['LANG']->getLL('checkScript_update_description') . '</h3>';
+ $content .= '<p><code>php ' . PATH_typo3 . 'cli_dispatch.phpsh lowlevel_refindex -e</code></p>';
$content .= '<div class="typo3-message message-information"><div class="message-body">' . $GLOBALS['LANG']->getLL('checkScript_information') . '</div></div>';
- $content .= '<p>' . $GLOBALS['LANG']->getLL('checkScript_moreDetails') . '<br /><a href="' . $GLOBALS['BACK_PATH'] . 'sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt" target="_new">' . PATH_typo3 . 'sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt</a></p>';
+
+ $content .= '<p>' . $GLOBALS['LANG']->getLL('checkScript_moreDetails') . '<br />';
+ $content .= '<a href="' . $GLOBALS['BACK_PATH'] . 'sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt" target="_new">' . PATH_typo3 . 'sysext/lowlevel/HOWTO_clean_up_TYPO3_installations.txt</a></p>';
$this->content .= $this->doc->section($GLOBALS['LANG']->getLL('checkScript_headline'), $content, FALSE, TRUE);
}
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
index e5c842bee9a2..12f1d6aa7b5f 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
@@ -90,7 +90,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
*/
public function render() {
$this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
- $this->content .= $this->doc->section('', $GLOBALS['LANG']->getLL('description'));
+ $this->content .= '<p class="lead">' . $GLOBALS['LANG']->getLL('description') . '</p>';
if ($this->isAccessibleForCurrentUser) {
$this->loadHeaderData();
// div container for renderTo
diff --git a/typo3/sysext/reports/Classes/Report/Status/Status.php b/typo3/sysext/reports/Classes/Report/Status/Status.php
index 656317f808f6..30e8045bf673 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Status.php
@@ -55,7 +55,7 @@ class Status implements \TYPO3\CMS\Reports\ReportInterface {
// Updating the registry
$registry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Registry');
$registry->set('tx_reports', 'status.highestSeverity', $highestSeverity);
- $content .= '<p class="help">' . $GLOBALS['LANG']->getLL('status_report_explanation') . '</p>';
+ $content .= '<p class="lead">' . $GLOBALS['LANG']->getLL('status_report_explanation') . '</p>';
return $content . $this->renderStatus($status);
}
diff --git a/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html b/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html
index 2849cda69362..7e6369e2a8e2 100644
--- a/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html
+++ b/typo3/sysext/reports/Resources/Private/Templates/Report/Detail.html
@@ -14,7 +14,6 @@
{error}
</f:then>
<f:else>
- <h2 class="uppercase"><f:translate key="{report.title}" /></h2>
<f:format.html parseFuncTSPath="">{content}</f:format.html>
</f:else>
</f:if>
diff --git a/typo3/sysext/reports/Resources/Public/styles.css b/typo3/sysext/reports/Resources/Public/styles.css
index b93ef76438b5..543756c7c8ff 100644
--- a/typo3/sysext/reports/Resources/Public/styles.css
+++ b/typo3/sysext/reports/Resources/Public/styles.css
@@ -2,11 +2,6 @@ body#ext-reports-mod-index-php {
margin: 0px;
}
-#typo3-inner-docbody p.help {
- margin-bottom: 10px;
-}
-
-
/* ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- */
/* status report */
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 09794a892965..03d8a86ee341 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -316,8 +316,10 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
if ($this->CMD == 'user') {
$this->createSchedulerUser();
}
+
// Start generating the content
- $content = $GLOBALS['LANG']->getLL('msg.schedulerSetupCheck');
+ $content = '<p class="lead">' . $GLOBALS['LANG']->getLL('msg.schedulerSetupCheck') . '</p>';
+
// Display information about last automated run, as stored in the system registry
/** @var $registry \TYPO3\CMS\Core\Registry */
$registry = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Registry');
@@ -439,8 +441,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
$tr++;
}
// Render the table and return it
- $content = '<div>' . $GLOBALS['LANG']->getLL('msg.infoScreenIntro') . '</div>';
- $content .= $this->doc->spacer(5);
+ $content = '<p class="lead">' . $GLOBALS['LANG']->getLL('msg.infoScreenIntro') . '</p>';
$content .= $this->doc->table($table, $tableLayout);
}
return $content;
diff --git a/typo3/sysext/t3skin/stylesheets/structure/main_content.css b/typo3/sysext/t3skin/stylesheets/structure/main_content.css
index 2043869199ef..65a3cd651eea 100644
--- a/typo3/sysext/t3skin/stylesheets/structure/main_content.css
+++ b/typo3/sysext/t3skin/stylesheets/structure/main_content.css
@@ -57,6 +57,8 @@ div.hr {
height: 1px;
}
+.lead { font-size: 1.3em; }
+
/** .uppercase is kept for backwards-compatibility, use .divider */
.divider,
.uppercase {
--
GitLab