From daae031fed31a3a97c440a09f2215b42d5296eb4 Mon Sep 17 00:00:00 2001 From: christianbltr Date: Thu, 8 Sep 2016 13:42:11 +0200 Subject: [PATCH] Add type, uid and pid to the overview page in the backend module and add some styling. --- ChangeLog | 1 + .../Controller/BackendModuleController.php | 40 ++++++++---- Resources/Private/Language/locallang_mod.xml | 2 + Resources/Public/Css/backendModule.css | 61 +++++++++++-------- 4 files changed, 65 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc6458fd..7aa1a5f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ current master [BUGFIX] Make external tools work w/ UTF-8 file names by using CommandUtility::escapeShellArgument(). Thanks to Martin Voss. https://github.com/teaminmedias-pluswerk/ke_search/pull/61. [BUGFIX] Fix page browser issues with realurl. Thanks to Toben Schmidt. https://forge.typo3.org/issues/77454. https://github.com/teaminmedias-pluswerk/ke_search/pull/62. [TASK] Do not hide "layout" field in the backend. https://github.com/teaminmedias-pluswerk/ke_search/issues/60. +[TASK] Add type, uid and pid to the overview page in the backend module and add some styling. Version 2.3.1, July 2016 [TASK] Set version to 2.3.1, just to match the TER version number. diff --git a/Classes/Controller/BackendModuleController.php b/Classes/Controller/BackendModuleController.php index de399c0b..25b13176 100644 --- a/Classes/Controller/BackendModuleController.php +++ b/Classes/Controller/BackendModuleController.php @@ -134,12 +134,6 @@ public function startIndexingAction() } } - // show information about indexer configurations and number of records - // if action "start indexing" is not selected - if ($this->do != 'startindexer') { - $content .= $this->printIndexerConfigurations($indexerConfigurations); - $content .= $this->printNumberOfRecords(); - } // check for index process lock in registry // remove lock if older than 12 hours @@ -152,6 +146,13 @@ public function startIndexingAction() $lockTime = null; } + // show information about indexer configurations and number of records + // if action "start indexing" is not selected + if ($this->do != 'startindexer') { + $content .= $this->printNumberOfRecords(); + $content .= $this->printIndexerConfigurations($indexerConfigurations); + } + // show "start indexing" or "remove lock" button if ($lockTime !== null) { if (!$this->getBackendUser()->user['admin']) { @@ -277,7 +278,7 @@ public function showLastIndexingReport() $logrow = $this->databaseConnection->exec_SELECTgetSingleRow('*', 'sys_log', 'details LIKE "[ke_search]%"', '', 'tstamp DESC'); if ($logrow !== false) { - $content = '
' . $logrow['details'] . '
'; + $content = '
' . $logrow['details'] . '
'; } else { $content = 'No report found.'; } @@ -315,13 +316,26 @@ public function printIndexerConfigurations($indexerConfigurations) $content = ''; // show indexer names if ($indexerConfigurations) { - $content .= '

' . LocalizationUtility::translate('LLL:EXT:ke_search/Resources/Private/Language/locallang_mod.xml:configurations_found', - 'KeSearch') . '

'; - $content .= ''; + $content .= ''; } return $content; @@ -338,7 +352,7 @@ public function printNumberOfRecords() $content = ''; $numberOfRecords = $this->getNumberOfRecordsInIndex(); if ($numberOfRecords) { - $content .= '

' . LocalizationUtility::translate('LLL:EXT:ke_search/Resources/Private/Language/locallang_mod.xml:index_contains', + $content .= '

' . LocalizationUtility::translate('LLL:EXT:ke_search/Resources/Private/Language/locallang_mod.xml:index_contains', 'KeSearch') . ' ' . $numberOfRecords . ' ' . LocalizationUtility::translate('LLL:EXT:ke_search/Resources/Private/Language/locallang_mod.xml:records', 'KeSearch') . ': '; diff --git a/Resources/Private/Language/locallang_mod.xml b/Resources/Private/Language/locallang_mod.xml index aa20d31f..7d1d4783 100644 --- a/Resources/Private/Language/locallang_mod.xml +++ b/Resources/Private/Language/locallang_mod.xml @@ -24,6 +24,8 @@ + + diff --git a/Resources/Public/Css/backendModule.css b/Resources/Public/Css/backendModule.css index dfe69f82..2e858580 100644 --- a/Resources/Public/Css/backendModule.css +++ b/Resources/Public/Css/backendModule.css @@ -4,23 +4,22 @@ clear: both; display:block; } - .box { -moz-border-radius: 2px; border-radius: 2px; border: 1px solid #666; padding: 5px; margin-top: 10px; - background: #DDD; - box-shadow: 2px 2px 2px #AFAFAF; - -moz-box-shadow: 2px 2px 2px #AFAFAF; - -webkit-box-shadow: 2px 2px 2px #AFAFAF; + background: #eee; + box-shadow: 1px 1px 1px #AFAFAF; + -moz-box-shadow: 1px 1px 1px #AFAFAF; + -webkit-box-shadow: 1px 1px 1px #AFAFAF; } .box .headline { -moz-border-radius: 2px; border-radius: 2px; border: 1px solid #666; - padding: 1px 1px 1px 5px; + padding: 3px 1px 1px 3px; background: #888; color: white; margin-bottom: 3px; @@ -30,34 +29,44 @@ -moz-border-radius: 2px; border-radius: 2px; border: 1px solid #666; - padding: 1px 1px 1px 5px; + padding: 1px 3px 1px 3px; background: white; } -.info, .tag { +.info, .tag, .tagbig, .tagsmall { padding: 2px 4px; -moz-border-radius: 2px; border-radius: 2px; border: 1px solid black; background: white; - margin-left:2px; + margin-right:2px; +} +.tagbig { + font-size:120%; + font-weight:bold; + color:white; + background:#666; +} +.tagsmall { + font-size:80%; } .info { width:48%; float:left; } - .summary { -moz-border-radius: 2px; border-radius: 2px; - border: 3px solid #666; - padding: 10px; + border: 2px solid #666; + padding: 12px; margin-top: 10px; background: white; - box-shadow: 5px 5px 5px #AFAFAF; - -moz-box-shadow: 5px 5px 5px #AFAFAF; - -webkit-box-shadow: 5px 5px 5px #AFAFAF; - + box-shadow: 1px 1px 1px #AFAFAF; + -moz-box-shadow: 1px 1px 1px #AFAFAF; + -webkit-box-shadow: 1px 1px 1px #AFAFAF; +} +.infobox { + max-width: 400px; } .summary .title { font-size: 120%; @@ -72,6 +81,11 @@ float: right; text-align: left; } +.orderedlist { + list-style: none; + margin:0; + padding:0; +} .infolabel { font-weight: bold; } @@ -79,14 +93,17 @@ text-align: left; } +a.lock-button:hover, +.lock-button, .reindex-button, a.index-button:hover, .index-button { + font-size:120%; -moz-border-radius: 2px; border-radius: 2px; background: green; - padding: 5px; - width: 250px; + padding: 8px; + max-width: 400px; display: block; text-align: center; font-weight: bold; @@ -103,15 +120,7 @@ a.index-button:hover { a.lock-button:hover, .lock-button { - -moz-border-radius: 2px; - border-radius: 2px; background: red; - padding: 5px; - width: 250px; - display: block; - text-align: center; - font-weight: bold; - color: white } a.lock-button:hover {