deleted file mode 100644

@@ -1,39 +0,0 @@

-<?php

-

-/**

- * Pagelist for Contao

- *

- * Copyright (c) 2015 Benjamin Roth

- *

- * @license LGPL-3.0+

- */

-

-/**

- * Palettes

- */

-$str_replace = ',teaser,teaserSRC,teaserSize';

-$GLOBALS['TL_DCA']['tl_article']['palettes']['default'] = str_replace(array(',teaser,',',teaser;'), array($str_replace.',',$str_replace.';'),$GLOBALS['TL_DCA']['tl_article']['palettes']['default']);

-

-

-/**

- * Fields

- */

-$GLOBALS['TL_DCA']['tl_article']['fields']['teaserSRC'] = array

-(

-    'label'                   => &$GLOBALS['TL_LANG']['tl_article']['teaserSRC'],

-    'exclude'                 => true,

-    'inputType'               => 'fileTree',

-    'eval'                    => array('fieldType'=>'checkbox', 'multiple'=>false, 'files'=>true, 'filesOnly'=>true, 'extensions'=>'jpg,gif,png,jpeg'),

-    'sql'                     => 'binary(16) NULL'

-);

-

-$GLOBALS['TL_DCA']['tl_article']['fields']['teaserSize'] = array

-(

-    'label'                   => &$GLOBALS['TL_LANG']['tl_article']['teaserSize'],

-    'exclude'                 => true,

-    'inputType'               => 'imageSize',

-    'options'                 => System::getImageSizes(),

-    'reference'               => &$GLOBALS['TL_LANG']['MSC'],

-    'eval'                    => array('rgxp'=>'natural', 'includeBlankOption'=>true, 'nospace'=>true, 'helpwizard'=>true),

-    'sql'                     => "varchar(64) NOT NULL default ''"

-);

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,57 @@

+<?php

+

+/**

+ * Pagelist for Contao

+ *

+ * Copyright (c) 2015 Benjamin Roth

+ *

+ * @license LGPL-3.0+

+ */

+

+/**

+ * Palettes

+ */

+$GLOBALS['TL_DCA']['tl_page']['palettes']['regular'] = str_replace('{meta_legend}', '{teaser_legend},teaserCssID,teaser,teaserSRC,teaserSize;{meta_legend}',$GLOBALS['TL_DCA']['tl_page']['palettes']['regular']);

+

+

+/**

+ * Fields

+ */

+$GLOBALS['TL_DCA']['tl_page']['fields']['teaserSRC'] = array

+(

+    'label'                   => &$GLOBALS['TL_LANG']['tl_page']['teaserSRC'],

+    'exclude'                 => true,

+    'inputType'               => 'fileTree',

+    'eval'                    => array('fieldType'=>'checkbox', 'multiple'=>false, 'files'=>true, 'filesOnly'=>true, 'extensions'=>'jpg,gif,png,jpeg'),

+    'sql'                     => 'binary(16) NULL'

+);

+

+$GLOBALS['TL_DCA']['tl_page']['fields']['teaserSize'] = array

+(

+    'label'                   => &$GLOBALS['TL_LANG']['tl_page']['teaserSize'],

+    'exclude'                 => true,

+    'inputType'               => 'imageSize',

+    'options'                 => System::getImageSizes(),

+    'reference'               => &$GLOBALS['TL_LANG']['MSC'],

+    'eval'                    => array('rgxp'=>'natural', 'includeBlankOption'=>true, 'nospace'=>true, 'helpwizard'=>true),

+    'sql'                     => "varchar(64) NOT NULL default ''"

+);

+

+$GLOBALS['TL_DCA']['tl_page']['fields']['teaserCssID'] = array

+(

+  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['teaserCssID'],

+  'exclude'                 => true,

+  'inputType'               => 'text',

+  'eval'                    => array('multiple'=>true, 'size'=>2),

+  'sql'                     => "varchar(255) NOT NULL default ''"

+);

+

+$GLOBALS['TL_DCA']['tl_page']['fields']['teaser'] = array

+(

+  'label'                   => &$GLOBALS['TL_LANG']['tl_page']['teaser'],

+  'exclude'                 => true,

+  'inputType'               => 'textarea',

+  'search'                  => true,

+  'eval'                    => array('rte'=>'tinyMCE', 'tl_class'=>'clr'),

+  'sql'                     => "text NULL"

+);

\ No newline at end of file

deleted file mode 100644

@@ -1,17 +0,0 @@

-<?php

-

-/**

- * Pagelist for Contao

- *

- * Copyright (c) 2015 Benjamin Roth

- *

- * @license LGPL-3.0+

- */

-

-/**

- * Fields

- */

-$GLOBALS['TL_LANG']['tl_article']['teaserSRC'][0] = 'Teaserbild';

-$GLOBALS['TL_LANG']['tl_article']['teaserSRC'][1] = 'Bitte wählen Sie eine Bilddatei aus der Dateiübersicht.';

-$GLOBALS['TL_LANG']['tl_article']['teaserSize'][0] = 'Bildgröße';

-$GLOBALS['TL_LANG']['tl_article']['teaserSize'][1] = 'Hier können Sie Abmessungen des Bildes und den Skalierungsmodus festlegen.';

new file mode 100644

@@ -0,0 +1,27 @@

+<?php

+

+/**

+ * Pagelist for Contao

+ *

+ * Copyright (c) 2015 Benjamin Roth

+ *

+ * @license LGPL-3.0+

+ */

+

+/**

+ * Fields

+ */

+$GLOBALS['TL_LANG']['tl_page']['teaserSRC'][0] = 'Teaserbild';

+$GLOBALS['TL_LANG']['tl_page']['teaserSRC'][1] = 'Bitte wählen Sie eine Bilddatei aus der Dateiübersicht.';

+$GLOBALS['TL_LANG']['tl_page']['teaserSize'][0] = 'Bildgröße';

+$GLOBALS['TL_LANG']['tl_page']['teaserSize'][1] = 'Hier können Sie Abmessungen des Bildes und den Skalierungsmodus festlegen.';

+$GLOBALS['TL_LANG']['tl_page']['teaserCssID'][0] = 'Teaser-CSS-ID/Klasse';

+$GLOBALS['TL_LANG']['tl_page']['teaserCssID'][1] = 'Hier können Sie eine ID und beliebig viele Klassen für das Teaser-Element eingeben.';

+$GLOBALS['TL_LANG']['tl_page']['teaser'][0] = 'Artikelteaser';

+$GLOBALS['TL_LANG']['tl_page']['teaser'][1] = 'Der Teasertext kann auch mit dem Inhaltselement "Artikelteaser" dargestellt werden.';

+

+

+/**

+ * Legends

+ */

+$GLOBALS['TL_LANG']['tl_page']['teaser_legend'] = 'Artikelteaser';

deleted file mode 100644

@@ -1,17 +0,0 @@

-<?php

-

-/**

- * Pagelist for Contao

- *

- * Copyright (c) 2015 Benjamin Roth

- *

- * @license LGPL-3.0+

- */

-

-/**

- * Fields

- */

-$GLOBALS['TL_LANG']['tl_article']['teaserSRC'][0] = 'Teaser image';

-$GLOBALS['TL_LANG']['tl_article']['teaserSRC'][1] = 'Please choose an image file from the files directory.';

-$GLOBALS['TL_LANG']['tl_article']['teaserSize'][0] = 'Image size';

-$GLOBALS['TL_LANG']['tl_article']['teaserSize'][1] = 'Here you can set the image dimensions and the resize mode.';

new file mode 100644

@@ -0,0 +1,27 @@

+<?php

+

+/**

+ * Pagelist for Contao

+ *

+ * Copyright (c) 2015 Benjamin Roth

+ *

+ * @license LGPL-3.0+

+ */

+

+/**

+ * Fields

+ */

+$GLOBALS['TL_LANG']['tl_page']['teaserSRC'][0] = 'Teaser image';

+$GLOBALS['TL_LANG']['tl_page']['teaserSRC'][1] = 'Please choose an image file from the files directory.';

+$GLOBALS['TL_LANG']['tl_page']['teaserSize'][0] = 'Image size';

+$GLOBALS['TL_LANG']['tl_page']['teaserSize'][1] = 'Here you can set the image dimensions and the resize mode.';

+$GLOBALS['TL_LANG']['tl_page']['teaserCssID'][0] = 'Teaser CSS ID/class';

+$GLOBALS['TL_LANG']['tl_page']['teaserCssID'][1] = 'Here you can set an ID and one or more classes for the teaser element.';

+$GLOBALS['TL_LANG']['tl_page']['teaser'][0] = 'Article teaser';

+$GLOBALS['TL_LANG']['tl_page']['teaser'][1] = 'The article teaser can also be displayed with the content element "article teaser".';

+

+

+/**

+ * Legends

+ */

+$GLOBALS['TL_LANG']['tl_page']['teaser_legend'] = 'Article teaser';

@@ -185,25 +185,14 @@ class ModulePagelist extends Module

 				// Get href

 				$href = $this->generateFrontendUrl($objSubpages->row());

-				$objArticle = $this->Database->prepare("SELECT a.id AS aid, a.title AS title, a.alias AS aalias, a.teaser AS teaser, a.teaserSRC AS teaserSRC, a.teaserSize AS teaserSize, a.inColumn AS inColumn, a.teaserCssID AS teaserCssID FROM tl_article a WHERE a.pid=? AND inColumn = 'main' ORDER BY sorting")

-				->limit(1)

-				->execute($objSubpages->id);

-

-				if ($objArticle->numRows < 1)

-				{

-					continue;

-				}

-				

-				$objContent = $this->Database->execute("SELECT count(id) as `count` FROM tl_content WHERE pid = '".$objArticle->aid."'");

-				

 				$row = $objSubpages->row();

 				// Add an image

-				if ($this->showTeaserImg && $objArticle->teaserSRC != '')

+				if ($this->showTeaserImg && $objSubpages->teaserSRC != '')

 				{

 					$arrData = array();

 					$objClass = new \stdClass();

-					$objModel = \FilesModel::findByUuid($objArticle->teaserSRC);

+					$objModel = \FilesModel::findByUuid($objSubpages->teaserSRC);

 					// Override the default image size

 					if ($this->imgSize != '')

@@ -215,7 +204,7 @@ class ModulePagelist extends Module

 							$arrData['size'] = $this->imgSize;

 						}

 					} else {

-						$arrData['size'] = $objArticle->teaserSize;

+						$arrData['size'] = $objSubpages->teaserSize;

 					}

 					if ($objModel !== null && is_file(TL_ROOT . '/' . $objModel->path))

@@ -230,18 +219,15 @@ class ModulePagelist extends Module

 				$row['isActive'] = ($objPage->id == $objSubpages->id ? true : false);

 				$row['subitems'] = (bool) $subitems;

-				list($row['cssId'], $row['class']) = (deserialize($objArticle->teaserCssID));

+				list($row['cssId'], $row['class']) = (deserialize($objSubpages->teaserCssID));

 				$row['title'] = $objSubpages->title;

 				$row['pageTitle'] = $objSubpages->pageTitle;

 				$row['href'] = $href;

-				$row['headline'] = $objArticle->title;

-				$row['text'] = $objArticle->teaser;

-				if ($objContent->count > 0)

-				{

-					$row['readMore'] = specialchars(sprintf($GLOBALS['TL_LANG']['MSC']['readMore'], $objArticle->title));

-					$row['more'] = $GLOBALS['TL_LANG']['MSC']['more'];

-				}

+				$row['headline'] = $objSubpages->title;

+				$row['text'] = $objSubpages->teaser;

+        $row['readMore'] = specialchars(sprintf($GLOBALS['TL_LANG']['MSC']['readMore'], $objSubpages->title));

+        $row['more'] = $GLOBALS['TL_LANG']['MSC']['more'];

 				$items[] = $row;

 			}