Index: ChangeLog =================================================================== --- ChangeLog (revision 26948) +++ ChangeLog (working copy) @@ -334,7 +334,7 @@ * flexform changes: cleaned up the flexform, added some missong localisation labels, moved some fields to other sheets. * new flexform option: "Template part number / optionSplit of template part numbers". Same as "altLayoutsOptionSplit" in TS but applies only to the current content element. - * new flexform option: "OptionSplit for cropping lenght of subheader". This overwrites the "lenght" parameter from subheader_stdWrap.crop with an optionsplitted value (applies only to the current content element). This parameter is also available in TS: "plugin.tt_news.croppingLenghtOptionSplit" + * new flexform option: "OptionSplit for cropping length of subheader". This overwrites the "length" parameter from subheader_stdWrap.crop with an optionsplitted value (applies only to the current content element). This parameter is also available in TS: "plugin.tt_news.croppingLengthOptionSplit" * more optionsSplits ? ;-) : now the fields "imagesize" and "imagewidth" in flexforms can also be filled with splitted options. * fix #6659: added 2 new options to the recursive selecor in the flexform: "defined by TS" and "0 levels". 0 levels allows to override a globally given value for recursive by 0 for only one content element. * new option/marker: plugin.tt_news.archiveActiveMarkerContent is filled to the marker ###ARCHIVE_ACTIVE### when the current archive period is selected. By default this marker is rendered to the opening
  • tag of an archive item and it is filled with 'class="amenu-act"'. @@ -2301,7 +2301,7 @@ - cleaned up the html-template, added alternating templateparts removed font tages... - added a 3rd wrap, eg. for the amenu header - added a 4th global color used by the list view - - removed the maxCatText lenght cropping from FF (cause its only working in linkMode1 in the other link modes it causes broken html) + - removed the maxCatText length cropping from FF (cause its only working in linkMode1 in the other link modes it causes broken html) - added a getLL var for the 'age' prefix - added comments - new help image @@ -2408,7 +2408,7 @@ * cvsroot/typo3xdev/tx_ttnews/pi/class.tx_ttnews.php 1.18: re-ordered and commented the init_news function moved some more conf-vars to the init_news function and the internal config array - added a new TSvar: 'emptyArchListAtStart' if this is set, the archive listing shows nothing when no periodStart or lenght is given in the GET vars. + added a new TSvar: 'emptyArchListAtStart' if this is set, the archive listing shows nothing when no periodStart or length is given in the GET vars. The default behavior for the archive listing with no parameters is now: show all archive items starting from today-datetimeDaysToArchive changed the order of the formatStr und the strWrap functions for news links in function getItemMarkerArray (now links in bodytext and news links are handled the same) Index: flexform_ds.xml =================================================================== --- flexform_ds.xml (revision 26948) +++ flexform_ds.xml (working copy) @@ -353,26 +353,26 @@ - + - + input 10 - - + + - + input 60 - + Index: flexform_ds_no_sPID.xml =================================================================== --- flexform_ds_no_sPID.xml (revision 26948) +++ flexform_ds_no_sPID.xml (working copy) @@ -351,26 +351,26 @@ - + - + input 10 - - + + - + input 60 - + Index: lib/class.tx_ttnews_helpers.php =================================================================== --- lib/class.tx_ttnews_helpers.php (revision 26948) +++ lib/class.tx_ttnews_helpers.php (working copy) @@ -231,7 +231,7 @@ * inserts pagebreaks after a certain amount of words * * @param string text which can contain manully inserted 'pageBreakTokens' - * @param integer amount of words in the subheader (short). The lenght of the first page will be reduced by that amount of words added to the value of $this->conf['cropWordsFromFirstPage']. + * @param integer amount of words in the subheader (short). The length of the first page will be reduced by that amount of words added to the value of $this->conf['cropWordsFromFirstPage']. * @return string the processed text */ function insertPagebreaks($text, $firstPageWordCrop) { Index: locallang_tca.xml =================================================================== --- locallang_tca.xml (revision 26948) +++ locallang_tca.xml (working copy) @@ -116,8 +116,8 @@ - - + + @@ -268,7 +268,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -548,7 +548,7 @@ - + @@ -626,7 +626,7 @@ - + @@ -724,7 +724,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -868,7 +868,7 @@ - + @@ -933,7 +933,7 @@ - + @@ -1054,7 +1054,7 @@ - + @@ -1191,7 +1191,7 @@ - + @@ -1270,7 +1270,7 @@ - + @@ -1429,7 +1429,7 @@ - + @@ -1488,7 +1488,7 @@ - + @@ -1566,7 +1566,7 @@ - + @@ -1664,7 +1664,7 @@ - + @@ -1733,7 +1733,7 @@ - + @@ -1808,7 +1808,7 @@ - + @@ -1873,7 +1873,7 @@ - + @@ -1994,7 +1994,7 @@ - + @@ -2084,7 +2084,7 @@ - + @@ -2172,7 +2172,7 @@ - + @@ -2257,7 +2257,7 @@ - + Index: pi/class.tx_ttnews.php =================================================================== --- pi/class.tx_ttnews.php (revision 26948) +++ pi/class.tx_ttnews.php (working copy) @@ -401,12 +401,12 @@ $altLayouts = trim($this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'altLayoutsOptionSplit', 's_template')); $this->config['altLayoutsOptionSplit'] = $altLayouts ? $altLayouts : trim($this->conf['altLayoutsOptionSplit']); - // Get cropping lenght + // Get cropping length - $croppingLenghtOptionSplit = trim($this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'croppingLenghtOptionSplit', 's_template')); - $this->config['croppingLenghtOptionSplit'] = $croppingLenghtOptionSplit ? $croppingLenghtOptionSplit : trim($this->conf['croppingLenghtOptionSplit']); - $this->config['croppingLenght'] = trim($this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'croppingLenght', 's_template')); + $croppingLengthOptionSplit = trim($this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'croppingLengthOptionSplit', 's_template')); + $this->config['croppingLengthOptionSplit'] = $croppingLengthOptionSplit ? $croppingLengthOptionSplit : trim($this->conf['croppingLengthOptionSplit']); + $this->config['croppingLength'] = trim($this->pi_getFFvalue($this->cObj->data['pi_flexform'], 'croppingLength', 's_template')); $this->initTemplate(); @@ -581,7 +581,7 @@ $this->hObj->getParsetime(__METHOD__); } - $noPeriod = 0; // used to call getSelectConf without a period lenght (pL) at the first archive page + $noPeriod = 0; // used to call getSelectConf without a period length (pL) at the first archive page if (! $this->conf['emptyArchListAtStart']) { @@ -598,7 +598,7 @@ } } if ($this->piVars['pS'] && ! $this->piVars['pL']) { - $noPeriod = 1; // override the period lenght checking in getSelectConf + $noPeriod = 1; // override the period length checking in getSelectConf } if (1) { @@ -933,22 +933,22 @@ $lConf['image.']['file.']['maxW'] = $this->config['FFimgW']; $lConf['image.']['file.']['maxH'] = $this->config['FFimgH']; } - if ($this->config['croppingLenght']) { - $lConf['subheader_stdWrap.']['crop'] = $this->config['croppingLenght']; + if ($this->config['croppingLength']) { + $lConf['subheader_stdWrap.']['crop'] = $this->config['croppingLength']; } $this->splitLConf = array(); if ($this->conf['enableOptionSplit']) { - if ($this->config['croppingLenghtOptionSplit']) { + if ($this->config['croppingLengthOptionSplit']) { $crop = $lConf['subheader_stdWrap.']['crop']; - if ($this->config['croppingLenght']) { - $crop = $this->config['croppingLenght']; + if ($this->config['croppingLength']) { + $crop = $this->config['croppingLength']; } $cparts = explode('|', $crop); if (is_array($cparts)) { $cropSuffix = '|' . $cparts[1] . ($cparts[2] ? '|' . $cparts[2] : ''); } - $lConf['subheader_stdWrap.']['crop'] = $this->config['croppingLenghtOptionSplit']; + $lConf['subheader_stdWrap.']['crop'] = $this->config['croppingLengthOptionSplit']; } $resCount = $GLOBALS['TYPO3_DB']->sql_num_rows($res); $this->splitLConf = $this->processOptionSplit($lConf, $limit, $resCount); @@ -2013,7 +2013,7 @@ $news_category = array(); $theCatImgCode = ''; $theCatImgCodeArray = array(); - $catTextLenght = 0; + $catTextLength = 0; $wroteRegister = false; $catSelLinkParams = ($this->conf['catSelectorTargetPid'] ? ($this->conf['itemLinkTarget'] ? $this->conf['catSelectorTargetPid'] . ' ' . $this->conf['itemLinkTarget'] : $this->conf['catSelectorTargetPid']) : $GLOBALS['TSFE']->id); @@ -2048,7 +2048,7 @@ } } - $catTextLenght += strlen($catTitle); + $catTextLength += strlen($catTitle); if ($this->config['catImageMode'] == 0 or empty($val['image'])) { $markerArray['###NEWS_CATEGORY_IMAGE###'] = ''; } else { @@ -2977,7 +2977,7 @@ * build the selectconf (array of query-parameters) to get the news items from the db * * @param string $where : where-part of the query - * @param integer $noPeriod : if this value exists the listing starts with the given 'period start' (pS). If not the value period start needs also a value for 'period lenght' (pL) to display something. + * @param integer $noPeriod : if this value exists the listing starts with the given 'period start' (pS). If not the value period start needs also a value for 'period length' (pL) to display something. * @return array the selectconf for the display of a news item */ function getSelectConf($addwhere, $noPeriod = 0) {