Merge of linkvalidator for RC3
authorSteffen Kamper <info@sk-typo3.de>
Tue, 25 Jan 2011 18:05:54 +0000 (18:05 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Tue, 25 Jan 2011 18:05:54 +0000 (18:05 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10305 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/linkvalidator/ChangeLog
typo3/sysext/linkvalidator/classes/class.tx_linkvalidator_processor.php
typo3/sysext/linkvalidator/classes/tasks/class.tx_linkvalidator_tasks_validatoradditionalfieldprovider.php
typo3/sysext/linkvalidator/doc/manual.sxw
typo3/sysext/linkvalidator/ext_emconf.php
typo3/sysext/linkvalidator/modfuncreport/class.tx_linkvalidator_modfuncreport.php
typo3/sysext/linkvalidator/modfuncreport/locallang.xml
typo3/sysext/linkvalidator/modfuncreport/mod_template.html
typo3/sysext/linkvalidator/res/linkvalidator.css
typo3/sysext/linkvalidator/res/pagetsconfig.txt

index f7b1397..6e255ec 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 
 2011-01-25  Steffen Kamper  <steffen@typo3.org>
 
+       * Merge of linkvalidator for RC3
        * Fixed bug #17286: sys_language -> flag selections ends at letter q (Thanks to Jo Hasenau)
        * Follow-up to #17289: resolved endless loop with login/logout
        * Fixed bug #17280: The FlashUploader does not disappear anymore
index e38a4f8..c602ce6 100644 (file)
@@ -1,4 +1,7 @@
-2011-01-20  Christopher Stelmaszyk  <chrissitopher@gmx.de>
+2011-01-25  Michael Miousse  <michael.miousse@infoglobe.ca>
+       * Added Feature #12447 Clearly separate Checks from Report in module    
+
+2011-01-21  Christopher Stelmaszyk  <chrissitopher@gmx.de>
 
        * Merged changes from mantis-#17176: Remove unnecessary comments and color profiles from all shipped .png / .gif files (Thanks to Steffen Gebert)
 
index 9353781..1ad30d3 100644 (file)
@@ -117,8 +117,13 @@ class tx_linkvalidator_Processor {
         */
        public function getLinkStatistics($checkOptions = array(), $considerHidden = FALSE) {
                $results = array();
-               $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_linkvalidator_link', 'record_pid in (' . $this->pidList . ') or ( record_uid IN (' . $this->pidList . ') and table_name like \'pages\')');
-
+               $checlLinkTypeCondition = '';
+               if(count($checkOptions) > 0) {
+                       $checkKeys = array_keys($checkOptions);
+                       $checlLinkTypeCondition = ' and link_type in (\'' . implode('\',\'',$checkKeys) . '\')';
+               }
+               $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_linkvalidator_link', '(record_pid in (' . $this->pidList . ') or ( record_uid IN (' . $this->pidList . ') and table_name like \'pages\')) ' . $checlLinkTypeCondition);
+               
                        // let's traverse all configured tables
                foreach ($this->searchFields as $table => $fields) {
                        if($table == 'pages'){
index 338f306..6a27e31 100644 (file)
@@ -123,7 +123,7 @@ class tx_linkvalidator_tasks_ValidatorAdditionalFieldProvider implements tx_sche
                $fieldCode = '<select name="tx_scheduler[linkvalidator][depth]" id="' . $fieldID . '">';
 
                foreach ($fieldValueArray as $depth => $label) {
-                       $fieldCode .= "\t" . '<option value="' . $depth . '"' . (($depth == htmlspecialchars($taskInfo['depth'])) ? ' selected="selected"' : '') . '>' . $label . '</option>';
+                       $fieldCode .= "\t" . '<option value="' .  htmlspecialchars($depth) . '"' . (($depth ==$taskInfo['depth']) ? ' selected="selected"' : '') . '>' . $label . '</option>';
                }
 
                $fieldCode .= '</select>';
index e200a50..c47a635 100644 (file)
Binary files a/typo3/sysext/linkvalidator/doc/manual.sxw and b/typo3/sysext/linkvalidator/doc/manual.sxw differ
index 6d13c00..63d7e84 100644 (file)
@@ -3,7 +3,7 @@
 ########################################################################
 # Extension Manager/Repository config file for ext "linkvalidator".
 #
-# Auto generated 21-01-2011 18:10
+# Auto generated 25-01-2011 18:37
 #
 # Manual updates:
 # Only the data in the array - everything else is removed by next
@@ -41,7 +41,7 @@ $EM_CONF[$_EXTKEY] = array(
                'suggests' => array(
                ),
        ),
-       '_md5_values_when_last_written' => 'a:26:{s:9:"ChangeLog";s:4:"fd4e";s:16:"ext_autoload.php";s:4:"4efa";s:12:"ext_icon.gif";s:4:"838b";s:17:"ext_localconf.php";s:4:"5e6f";s:14:"ext_tables.php";s:4:"1679";s:14:"ext_tables.sql";s:4:"2489";s:13:"locallang.xml";s:4:"15c4";s:44:"classes/class.tx_linkvalidator_processor.php";s:4:"d6cb";s:61:"classes/linktype/class.tx_linkvalidator_linktype_abstract.php";s:4:"4c43";s:61:"classes/linktype/class.tx_linkvalidator_linktype_external.php";s:4:"83ce";s:57:"classes/linktype/class.tx_linkvalidator_linktype_file.php";s:4:"0a91";s:62:"classes/linktype/class.tx_linkvalidator_linktype_interface.php";s:4:"b40b";s:61:"classes/linktype/class.tx_linkvalidator_linktype_internal.php";s:4:"e9b4";s:64:"classes/linktype/class.tx_linkvalidator_linktype_linkhandler.php";s:4:"49b6";s:56:"classes/tasks/class.tx_linkvalidator_tasks_validator.php";s:4:"2442";s:79:"classes/tasks/class.tx_linkvalidator_tasks_validatoradditionalfieldprovider.php";s:4:"cbac";s:14:"doc/manual.sxw";s:4:"68cf";s:14:"doc/manual.txt";s:4:"1b30";s:54:"modfuncreport/class.tx_linkvalidator_modfuncreport.php";s:4:"1642";s:27:"modfuncreport/locallang.xml";s:4:"9d28";s:31:"modfuncreport/locallang_csh.xml";s:4:"efa4";s:31:"modfuncreport/locallang_mod.xml";s:4:"e370";s:31:"modfuncreport/mod_template.html";s:4:"7ed2";s:21:"res/linkvalidator.css";s:4:"2f4e";s:21:"res/mailtemplate.html";s:4:"c425";s:20:"res/pagetsconfig.txt";s:4:"f657";}',
+       '_md5_values_when_last_written' => 'a:26:{s:9:"ChangeLog";s:4:"4585";s:16:"ext_autoload.php";s:4:"4efa";s:12:"ext_icon.gif";s:4:"838b";s:17:"ext_localconf.php";s:4:"5e6f";s:14:"ext_tables.php";s:4:"1679";s:14:"ext_tables.sql";s:4:"2489";s:13:"locallang.xml";s:4:"15c4";s:44:"classes/class.tx_linkvalidator_processor.php";s:4:"2d9e";s:61:"classes/linktype/class.tx_linkvalidator_linktype_abstract.php";s:4:"4c43";s:61:"classes/linktype/class.tx_linkvalidator_linktype_external.php";s:4:"83ce";s:57:"classes/linktype/class.tx_linkvalidator_linktype_file.php";s:4:"0a91";s:62:"classes/linktype/class.tx_linkvalidator_linktype_interface.php";s:4:"b40b";s:61:"classes/linktype/class.tx_linkvalidator_linktype_internal.php";s:4:"e9b4";s:64:"classes/linktype/class.tx_linkvalidator_linktype_linkhandler.php";s:4:"49b6";s:56:"classes/tasks/class.tx_linkvalidator_tasks_validator.php";s:4:"2442";s:79:"classes/tasks/class.tx_linkvalidator_tasks_validatoradditionalfieldprovider.php";s:4:"7681";s:14:"doc/manual.sxw";s:4:"dba1";s:14:"doc/manual.txt";s:4:"1b30";s:54:"modfuncreport/class.tx_linkvalidator_modfuncreport.php";s:4:"c32e";s:27:"modfuncreport/locallang.xml";s:4:"6a87";s:31:"modfuncreport/locallang_csh.xml";s:4:"efa4";s:31:"modfuncreport/locallang_mod.xml";s:4:"e370";s:31:"modfuncreport/mod_template.html";s:4:"4c0f";s:21:"res/linkvalidator.css";s:4:"53fb";s:21:"res/mailtemplate.html";s:4:"c425";s:20:"res/pagetsconfig.txt";s:4:"93e0";}',
        'suggests' => array(
        ),
 );
index d22a0d3..26b79b7 100644 (file)
@@ -2,7 +2,7 @@
 /***************************************************************
  *  Copyright notice
  *
- *  (c) 2005 - 2010 Jochen Rieger (j.rieger@connecta.ag) 
+ *  (c) 2005 - 2010 Jochen Rieger (j.rieger@connecta.ag)
  *  (c) 2010 - 2011 Michael Miousse (michael.miousse@infoglobe.ca)
  *  All rights reserved
  *
@@ -108,11 +108,19 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
        protected $refreshListHtml;
 
        /**
-        * Html for the Statistics table with the checkboxes of the link types and the numbers of broken links.
+        * Html for the Statistics table with the checkboxes of the link types and the numbers of broken links for Report tab.
         *
         * @var string
         */
        protected $checkOptHtml;
+       
+       
+       /**
+        * Html for the Statistics table with the checkboxes of the link types and the numbers of broken links for Check links tab.
+        *
+        * @var string
+        */
+       protected $checkOptHtmlCheck;
 
        /**
         * Complete content (html) to be displayed.
@@ -135,6 +143,19 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
                        $this->modTS = t3lib_BEfunc::getModTSconfig($this->pObj->id, 'mod.linkvalidator');
                        $this->modTS = $this->modTS['properties'];
                }
+               $update = t3lib_div::_GP('updateLinkList');
+               $prefix = '';
+               if (!empty($update)) {
+                       $prefix = 'check';
+               }
+               $set = t3lib_div::_GP($prefix . 'SET');
+               $this->pObj->handleExternalFunctionValue();
+
+               if(isset($this->searchLevel)) {
+                       $this->pObj->MOD_SETTINGS['searchlevel'] = $this->searchLevel;
+               } else {
+                       $this->searchLevel = $this->pObj->MOD_SETTINGS['searchlevel'];
+               }
 
                if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['linkvalidator']['checkLinks'])) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['linkvalidator']['checkLinks'] as $linkType => $value) {
@@ -143,15 +164,32 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
                                        $this->availableOptions[$linkType] = 1;
                                }
                                        // Compile list of types currently selected by the checkboxes.
-                               if ($this->pObj->MOD_SETTINGS[$linkType]) {
+                               if (($this->pObj->MOD_SETTINGS[$linkType] && empty($set)) || $set[$linkType]) {
                                        $this->checkOpt[$linkType] = 1;
+                                       $this->pObj->MOD_SETTINGS[$linkType] = 1;
+                               } else {
+                                       $this->pObj->MOD_SETTINGS[$linkType] = 0;
+                                       unset($this->checkOpt[$linkType]);
                                }
                        }
                }
+               $GLOBALS['BE_USER']->pushModuleData('web_info', $this->pObj->MOD_SETTINGS);
 
                $this->initialize();
+                       // Setting up the context sensitive menu:
+               $this->resPath = $this->doc->backPath . t3lib_extMgm::extRelPath('linkvalidator') . 'res/';
+               $this->pageRenderer = $this->doc->getPageRenderer();
+
+                       // Localization
+               $labels = tx_em_Tools::getArrayFromLocallang(t3lib_extMgm::extPath('linkvalidator', 'modfuncreport/locallang.xml'));
+               $this->pageRenderer->addInlineLanguageLabelArray($labels);
+
+                       // Add JS
+               $this->pageRenderer->addJsFile($this->doc->backPath . '../t3lib/js/extjs/ux/Ext.ux.FitToParent.js');
+               $this->pageRenderer->addJsFile($this->doc->backPath . '../t3lib/js/extjs/ux/flashmessages.js');
+               $this->pageRenderer->addJsFile($this->doc->backPath . 'js/extjs/iframepanel.js');
 
-               if ($this->modTS['showUpdateButton'] == 1) {
+               if ($this->modTS['showCheckLinkTab'] == 1) {
                        $this->updateListHtml = '<input type="submit" name="updateLinkList" value="' . $GLOBALS['LANG']->getLL('label_update') . '"/>';
                }
 
@@ -162,14 +200,47 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
 
                $brokenLinkOverView = $this->processor->getLinkCounts($this->pObj->id);
                $this->checkOptHtml = $this->getCheckOptions($brokenLinkOverView);
+               $this->checkOptHtmlCheck = $this->getCheckOptions($brokenLinkOverView, 'check');
+               $this->createTabs();
+               return '<div id="linkvalidator-modfuncreport"></div>';
+       }
 
-               $this->render();
-
+       /**
+        * Create TabPanel to split the report and the checklinks functions
+        *
+        * @return void
+        */
+       protected function createTabs() {
+               $panelCheck = '';
+               if ($this->modTS['showCheckLinkTab'] == 1) {
+                       $panelCheck = '{
+
+                      title: TYPO3.lang.CheckLink,
+                      html: ' . json_encode($this->flush()) . ',
+                       },      ';
+               }
 
-               return $this->flush();
+               $this->render();
+               $js = 'var panel = new Ext.TabPanel( {
+                       renderTo : "linkvalidator-modfuncreport",
+                       id: "linkvalidator-main",
+                       plain: true,
+                       activeTab: 0,
+                       autoScroll: true,
+                       bodyStyle: "padding:10px;",
+                       plugins: [new Ext.ux.plugins.FitToParent()],
+                       items : [
+                       {
+                      title: TYPO3.lang.Report,
+                               html: ' . json_encode($this->flush(TRUE)) . '
+                       },
+                       ' . $panelCheck . '
+                       ]
+
+               });';
+               $this->pageRenderer->addExtOnReadyCode($js);
        }
 
-
        /**
         * Initializes the menu array internally.
         *
@@ -255,7 +326,7 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
                $update = t3lib_div::_GP('updateLinkList');
 
                if (!empty($update)) {
-                       $this->processor->getLinkStatistics($this->availableOptions, $this->modTS['checkhidden']);
+                       $this->processor->getLinkStatistics($this->checkOpt, $this->modTS['checkhidden']);
                }
        }
 
@@ -284,13 +355,14 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
        /**
         * Flushes the rendered content to the browser.
         *
+        * @param boolean $form
         * @return void
         */
-       protected function flush() {
-               $content.= $this->doc->moduleBody(
+       protected function flush($form = FALSE) {
+               $content = $this->doc->moduleBody(
                        $this->pageRecord,
                        $this->getDocHeaderButtons(),
-                       $this->getTemplateMarkers()
+                       ($form) ? $this->getTemplateMarkers(): $this->getTemplateMarkersCheck()
                );
 
                return $content;
@@ -326,9 +398,8 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
         * @return html Content of the table or of the note
         */
        protected function renderBrokenLinksTable() {
-               $content = '';
-               $items = array();
-               $brokenLinkItems = '';
+               $items = $brokenLinksMarker = array();
+               $brokenLinkItems = $brokenLinksTemplate = '';
                $keyOpt = array();
 
                if (is_array($this->checkOpt)) {
@@ -394,7 +465,6 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
         * @return string Code of content
         */
        protected function startTable() {
-               global $TYPO3_CONF_VARS;
 
                        // Listing head
                $makerTableHead = array();
@@ -424,7 +494,7 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
         *
         * @param string $table Name of database table
         * @param array $row Record row to be processed
-        * @param string $brokenLinksItemTemplate Markup of the template to be used
+        * @param array $brokenLinksItemTemplate Markup of the template to be used
         * @return string HTML of the rendered row
         */
        protected function renderTableRow($table, array $row, $brokenLinksItemTemplate) {
@@ -469,7 +539,7 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
 
                $markerArray['actionlink'] = $actionLinks;
                $markerArray['path'] = t3lib_BEfunc::getRecordPath($row['record_pid'], '', 0, 0);
-               $markerArray['element'] = $element; 
+               $markerArray['element'] = $element;
                $markerArray['headlink'] = $row['link_title'];
                $markerArray['linktarget'] = $brokenUrl;
 
@@ -497,15 +567,15 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
         * @param array $brokenLinkOverView array of broken links information
         * @return string code content
         */
-       protected function getCheckOptions(array $brokenLinkOverView) {
-               $content = '';
-               $checkOptionsTemplate = '';
+       protected function getCheckOptions(array $brokenLinkOverView, $prefix = '') {
+               $markerArray = array();
+
                $checkOptionsTemplate = t3lib_parsehtml::getSubpart($this->doc->moduleTemplate, '###CHECKOPTIONS_SECTION###');
 
                $hookSectionContent = '';
                $hookSectionTemplate = t3lib_parsehtml::getSubpart($checkOptionsTemplate, '###HOOK_SECTION###');
 
-               $markerArray['statistics_header'] = $this->doc->sectionHeader($GLOBALS['LANG']->getLL('overviews.statistics.header'));
+               $markerArray['statistics_header'] = $this->doc->sectionHeader($GLOBALS['LANG']->getLL('report.statistics.header'));
 
                $totalCountLabel = $GLOBALS['LANG']->getLL('overviews.nbtotal');
                $totalCountLabel = t3lib_BEfunc::wrapInHelp('linkvalidator', 'checkboxes', $totalCountLabel);
@@ -534,14 +604,8 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
                                                }
                                                $translation = $GLOBALS['LANG']->getLL('hooks.' . $type);
                                                $translation = $translation ? $translation : $type;
-                                               $option = t3lib_BEfunc::getFuncCheck(
-                                                       array('id' => $this->pObj->id, 'search_levels' => $this->searchLevel),
-                                                       'SET[' . $type . ']',
-                                                       $this->pObj->MOD_SETTINGS[$type],
-                                                       '',
-                                                       '',
-                                                       'id="SET[' . $type . ']"'
-                                               ) . '<label for="SET[' . $type . ']">' . $translation . '</label>';
+                                               $option =  '<input type="checkbox" id="' . $prefix . 'SET[' . $type . ']" name="' . $prefix . 'SET[' . $type . ']" value="1"' . ($this->pObj->MOD_SETTINGS[$type]  ? ' checked="checked"' : '') .
+                                                       '/>'.'<label for="SET[' . $type . ']">' . htmlspecialchars( $translation ) . '</label>';
                                                $hookSectionMarker['option'] = $option;
                                                $hookSectionContent .= t3lib_parsehtml::substituteMarkerArray($hookSectionTemplate, $hookSectionMarker, '###|###', TRUE, TRUE);
                                        }
@@ -562,6 +626,7 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
         */
        protected function loadHeaderData() {
                $this->doc->addStyleSheet('linkvalidator', $this->relativePath . 'res/linkvalidator.css', 'linkvalidator');
+               $this->doc->getPageRenderer()->addJsFile($this->doc->backPath . '../t3lib/js/extjs/ux/Ext.ux.FitToParent.js');
        }
 
 
@@ -592,30 +657,7 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
                }
                return $result;
        }
-       /**
-        * construct the Hint message displayed on top of the module.
-        *
-        * @return string Hint message displayed on top of the module.
-        */
-       protected function getFirstSteps(){
-               $firstSteps = $GLOBALS['LANG']->getLL('first.steps');
 
-               if ($this->modTS['showUpdateButton'] == 1) {
-                       $firstSteps .= ' ' . $GLOBALS['LANG']->getLL('first.steps.info.update.button');
-               }
-
-               if (t3lib_extMgm::isLoaded('scheduler')) {
-                       if ($GLOBALS['BE_USER']->isAdmin()) {
-                               $firstSteps .= ' ' . 
-                               sprintf($GLOBALS['LANG']->getLL('first.steps.info.scheduler'),
-                                       '<a href="' . t3lib_div::getIndpEnv('TYPO3_SITE_URL') . 'typo3/mod.php?M=tools_txschedulerM1">', '</a>'
-                               );
-                       } else {
-                               $firstSteps .= ' ' . $GLOBALS['LANG']->getLL('first.steps.info.scheduler.admin');
-                       }
-               }
-               return $firstSteps;
-       }
 
        /**
         * Gets the filled markers that are used in the HTML template.
@@ -623,16 +665,36 @@ class tx_linkvalidator_ModFuncReport extends t3lib_extobjbase {
         * @return array The filled marker array
         */
        protected function getTemplateMarkers() {
-
                $markers = array(
-                       'FIRST_STEPS'           => $this->getFirstSteps(),
+                       'FUNC_TITLE'            => $GLOBALS['LANG']->getLL('report.func.title'),
+                       'CHECKOPTIONS_TITLE'    => $GLOBALS['LANG']->getLL('report.statistics.header'),
                        'FUNC_MENU'             => $this->getLevelSelector(),
                        'CONTENT'               => $this->content,
-                       'TITLE'                 => $GLOBALS['LANG']->getLL('title'),
                        'CHECKALLLINK'          => $this->checkAllHtml,
                        'CHECKOPTIONS'          => $this->checkOptHtml,
-                       'ID'                    => '<input type="hidden" name="id" value="' . $this->pObj->id . '"/>',
+                       'ID'                    => '<input type="hidden" name="id" value="' . $this->pObj->id . '" />',
                        'REFRESH'               => $this->refreshListHtml,
+                       'UPDATE'                => ''
+               );
+
+               return $markers;
+       }
+
+       /**
+        * Gets the filled markers that are used in the HTML template.
+        *
+        * @return array The filled marker array
+        */
+       protected function getTemplateMarkersCheck() {
+               $markers = array(
+                       'FUNC_TITLE'                    =>$GLOBALS['LANG']->getLL('checklinks.func.title'),
+                       'CHECKOPTIONS_TITLE'    =>$GLOBALS['LANG']->getLL('checklinks.statistics.header'),
+                       'FUNC_MENU'             => $this->getLevelSelector(),
+                       'CONTENT'               => '',
+                       'CHECKALLLINK'          => $this->checkAllHtml,
+                       'CHECKOPTIONS'          => $this->checkOptHtmlCheck,
+                       'ID'                    => '<input type="hidden" name="id" value="' . $this->pObj->id . '" />',
+                       'REFRESH'               => '',
                        'UPDATE'                => $this->updateListHtml
                );
 
index a6388a0..29facc4 100644 (file)
@@ -9,7 +9,6 @@
        </meta>
        <data type="array">
                <languageKey index="default" type="array">
-                       <label index="title">Check Links</label>
                        <label index="menu.introduction">Introduction</label>
                        <label index="menu.checkLinks">Check Links for validity</label>
                        <label index="menu.overview">Overview of links on website</label>
                        <label index="overview.branch.links">External links:</label>
                        <label index="overview.attention.header">Attention:</label>
                        <label index="overview.attention.text">Checking links may take up to several minutes. Checking ONE link can last up to 3 seconds.</label>
-                       <label index="first.steps">Choose the level of pages to check and press "Refresh display" to show the results.</label>
-                       <label index="first.steps.info.update.button">You can update the stored results by pressing "Check links". Note that this process can take some time.</label>
-                       <label index="first.steps.info.scheduler">Alternatively you can also configure the %sTYPO3 Scheduler%s to update the stored results regularly.</label>
-                       <label index="first.steps.info.scheduler.admin">Alternatively your administrator can also configure the TYPO3 Scheduler to update the stored results regularly.</label>
                        <label index="label_refresh">Refresh display</label>
                        <label index="label_update">Check links</label>
-                       <label index="overviews.statistics.header">Statistics of broken Links</label>
+                       <label index="report.statistics.header">Show these types of broken links</label>
+                       <label index="checklinks.statistics.header">Check these types of broken links</label>
+                       <label index="report.func.title">Show this level</label>
+                       <label index="checklinks.func.title">Check this level</label>
                        <label index="overviews.nbtotal">Broken links total:</label>
                        <label index="hooks.db">Internal Links:</label>
                        <label index="hooks.file">File Links:</label>
@@ -65,6 +63,8 @@
                        <label index="list.report.couldnotresolvehost">Could not resolve host. The given remote host was not resolved.</label>
                        <label index="list.report.errornetworkdata">Failure with receiving network data.</label>
                        <label index="list.msg.ok">Ok</label>
+                       <label index="Report">Report</label>
+                       <label index="CheckLink">Check Links</label>
                        <label index="list.msg.lastRun">%1$s %2$s</label>
                        <label index="list.no.broken.links.title">No broken links to show!</label>
                        <label index="list.no.broken.links">There are no broken links to be displayed.</label>
index 11f9cd3..4551263 100644 (file)
@@ -1,18 +1,18 @@
 <!-- ###FULLDOC### begin -->
-                       <h3>###TITLE###</h3>
-                       <p id="linkvalidator_firstSteps">###FIRST_STEPS###</p>
-                       <div class="linkvalidator_funcmenu">###FUNC_MENU######REFRESH######UPDATE###</div>
                        <div class="linkvalidator_checkoptions">
                                ###ID###
                                ###CHECKALLLINK###
-                               ###CHECKOPTIONS###
+                               <h4>###CHECKOPTIONS_TITLE###</h4>
+                               <div>###CHECKOPTIONS###</div>
                        </div>
+                       <div class="linkvalidator_funcmenu"><h4>###FUNC_TITLE###</h4><div>###FUNC_MENU###</div></div>
+                       <div class="linkvalidator_button">###REFRESH######UPDATE###</div>
+
                        ###CONTENT###
 <!-- ###FULLDOC### end -->
 
 
 <!-- ###CHECKOPTIONS_SECTION### begin -->
-       ###STATISTICS_HEADER###
        <table class="typo3-dblist" id="linkvalidator_statsTable" cellspacing="0" cellpadding="0">
                <tr class="t3-row-header">
                        <td>
index 679d614..c3363f6 100644 (file)
@@ -1,19 +1,37 @@
 @charset "UTF-8";
 
-#linkvalidator_firstSteps {
-       margin-bottom: 10px;
-}
-       
 .linkvalidator_funcmenu {
        margin-bottom: 25px;
+       margin-left: 25px;
+       margin-top: 0;
+       float: left;
+}
+.linkvalidator_checkoptions div {
+       float: left;
+}
+#linkvalidator-main .linkvalidator_funcmenu h4 {
+       clear: both;
+       padding: 0;
+}
+.linkvalidator_checkoptions h4 {
+       clear: both;
+}
+.linkvalidator_button {
+       clear: both;
 }
-
 .linkvalidator_funcmenu input {
        margin-left: 5px;
 }
 
 .linkvalidator_checkoptions {
        margin-bottom: 10px;
+       float:left;
+       display: block;
+       margin-top: 0px;
+       width: 225px;
+}
+#ext-gen19{
+overflow: auto;
 }
 
 .linkvalidator_checkoptions .typo3-message {
 #linkvalidator_brokenLinksTable td:first-child {
        border-left: none;
 }
+
+#linkvalidator-main h4 {
+       padding-top: 10px;
+}
+#linkvalidator-main .linkvalidator_checkoptions h4 {
+       padding-top: 0px;
+}
\ No newline at end of file
index a9c7326..7875e01 100644 (file)
@@ -6,7 +6,7 @@ mod.linkvalidator {
        }
        linktypes = db,file,external
        checkhidden = 0
-       showUpdateButton = 1
+       showCheckLinkTab = 1
        mail {
                fromname = Linkvalidator
                fromemail = Linkvalidator@example.com