Commit 1.1beta5 release (copied from TER)
authorMichael Stucki <michael.stucki@typo3.org>
Wed, 17 Oct 2007 09:08:08 +0000 (09:08 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Wed, 17 Oct 2007 09:08:08 +0000 (09:08 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/dam_ttcontent/trunk@7010 735d13b6-9817-0410-8766-e36946ffe9aa

ChangeLog [new file with mode: 0755]
class.ext_update.php [new file with mode: 0755]
class.ux_tx_cms_layout.php [new file with mode: 0755]
doc/manual.sxw
ext_conf_template.txt
ext_emconf.php
ext_localconf.php
pi_cssstyledcontent/class.tx_damttcontent_pi1.php
pi_cssstyledcontent/static/setup.txt

diff --git a/ChangeLog b/ChangeLog
new file mode 100755 (executable)
index 0000000..e4cbcab
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,8 @@
+07-02-21 Rene Fritz  <r.fritz@colorcube.de>
+
+       * Added: modifications to the page module (XCLASS) to enable the display of thumbnails.
+
+07-02-16 Rene Fritz  <r.fritz@colorcube.de>
+
+       * Change: remove mmforeign dependency
+       * Added: use ext_update.php to create warnings in EM when needed: mmforeign or T3 4.1.
diff --git a/class.ext_update.php b/class.ext_update.php
new file mode 100755 (executable)
index 0000000..7c31fdf
--- /dev/null
@@ -0,0 +1,146 @@
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 2003-2006 Rene Fritz (r.fritz@colorcube.de)
+*  All rights reserved
+*
+*  This script is part of the TYPO3 project. The TYPO3 project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+
+
+
+/**
+ * Class for updating the db
+ *
+ * @author      Rene Fritz <r.fritz@colorcube.de>
+ * @package TYPO3-DAM
+ * @subpackage tx_dam
+ */
+class ext_update  {
+
+       /**
+        * Main function, returning the HTML content of the module
+        *
+        * @return      string          HTML
+        */
+       function main() {
+
+               $content = '';
+
+               $content .= '<p>Following functions modify the database which might be needed due to changed default behaviour of content elements.</p>';
+
+               $updateAction = t3lib_div::_GP('updateAction');
+       
+               if ($updateAction === 'do_imagecaption_position_hidden')        {
+                       $updateContent = $this->perform_update_tt_content_imagecaption_position('hidden');
+               }
+               if ($updateAction === 'do_imagecaption_position_default')       {
+                       $updateContent = $this->perform_update_tt_content_imagecaption_position('default');
+               }
+
+               if ($updateContent)     {
+                       $content .= '<div class="bgColor5" style="margin:2em 0 1em 0; padding: 0.5em; border:1px solid #aaa">'.$updateContent.'</div>';
+               }
+               
+               
+               //
+               // captions
+               //
+                       
+               $onClickHidden = "document.location.href='".t3lib_div::linkThisScript(array('updateAction'=>'do_imagecaption_position_hidden'))."'; return false;";
+               $onClickVisible = "document.location.href='".t3lib_div::linkThisScript(array('updateAction'=>'do_imagecaption_position_default'))."'; return false;";
+                       
+               $content .= '<br /><h3>Image caption display</h3>
+                               <p>When css_styled_content is used for rendering, this extension can change the rendering so captions can be fetched from DAM for the content elements Image and Text w/image (see extension options).</p>
+                               <p>Captions might be visible now (coming from DAM) where no captions were needed. With the following functions...</p>
+                               <ul>
+                                 <li>all unused captions can be set hidden</li>
+                                 <li>all hidden captions can be set visible again</li>
+                               </ul>
+
+                       <input onclick="'.htmlspecialchars($onClickHidden).'" type="submit" value="Set unused captions hidden"> ' .
+                                       '<input onclick="'.htmlspecialchars($onClickVisible).'" type="submit" value="unhide captions"></form>
+               ';
+                       
+               
+               return $content;
+       }
+
+       /**
+        * Checks how many rows are found and returns true if there are any
+        *
+        * @return      boolean
+        */
+       function access()       {
+               
+               $this->checkMMforeign();
+
+               return true;
+       }
+
+
+       /**
+        * Do the DB update for tt_content.imagecaption_position
+        * 
+        * @return      string          HTML
+        */
+       function perform_update_tt_content_imagecaption_position($position)     {
+
+               $content = '';
+               $values = array();
+               
+               if ($position==='hidden') {
+                       $values['imagecaption_position'] = 'hidden';
+                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tt_content', 'LENGTH(imagecaption)=0', $values);
+                       $content .= '<p>Updated <em>Image</em> and <em>Text w/image</em> content elements. Set caption to be hidden where captions are unused.</p>';
+               } else {
+                       $values['imagecaption_position'] = '';
+                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tt_content', 'imagecaption_position='.$GLOBALS['TYPO3_DB']->fullQuoteStr('hidden', 'tt_content'), $values);
+                       $content .= '<p>Updated <em>Image</em> and <em>Text w/image</em> content elements. Set hidden captions to be visible.</p>';
+               }
+               return $content;
+       }
+       
+
+       /**
+        * Checks if mmforeign or T3 V 4.1 is installed and print a waring in EM when needed
+        *
+        * @return      void
+        */
+       function checkMMforeign()       {
+               
+               $mmforeign = t3lib_extMgm::isLoaded('mmforeign');
+               $isFourOne = t3lib_div::int_from_ver(TYPO3_branch)>=t3lib_div::int_from_ver('4.1');
+
+               if (!$mmforeign AND !$isFourOne) {
+                       $GLOBALS['SOBE']->content.=$GLOBALS['SOBE']->doc->section('WARNING: Extension \'mmforeign\' needs to be installed!','',0,1,3);
+               } elseif ($mmforeign AND $isFourOne) {
+                       $GLOBALS['SOBE']->content.=$GLOBALS['SOBE']->doc->section('NOTE: Extension \'mmforeign\' may not be needed with TYPO3 V4.1!','',0,1,1);
+               }
+       }
+
+}
+
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/class.ext_update.php']) {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/class.ext_update.php']);
+}
+
+
+?>
\ No newline at end of file
diff --git a/class.ux_tx_cms_layout.php b/class.ux_tx_cms_layout.php
new file mode 100755 (executable)
index 0000000..1e38ddc
--- /dev/null
@@ -0,0 +1,248 @@
+<?php
+/***************************************************************
+*  Copyright notice
+*
+*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  All rights reserved
+*
+*  This script is part of the TYPO3 project. The TYPO3 project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*  A copy is found in the textfile GPL.txt and important notices to the license
+*  from the author is found in LICENSE.txt distributed with these scripts.
+*
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+/**
+ * Include file extending db_list.inc for use with the web_layout module
+ *
+ * $Id: class.tx_cms_layout.php 1868 2006-12-12 11:24:10Z ingmars $
+ * Revised for TYPO3 3.6 November/2003 by Kasper Skaarhoj
+ * XHTML compliant
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ */
+/**
+ * [CLASS/FUNCTION INDEX of SCRIPT]
+ *
+ *
+ * (This index is automatically created/updated by the extension "extdeveval")
+ *
+ */
+
+
+
+
+/**
+ * Child class for the Web > Page module
+ *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @package TYPO3
+ * @subpackage core
+ */
+class ux_tx_cms_layout extends tx_cms_layout {
+
+
+       /**
+        * Draws the preview content for a content element
+        *
+        * @param       string          Content element
+        * @param       boolean         Set if the RTE link can be created.
+        * @return      string          HTML
+        */
+       function tt_content_drawItem($row, $isRTE=FALSE)        {
+               global $TCA;
+
+               $out='';
+               $outHeader='';
+
+                       // Make header:
+               if ($row['header'] && $row['header_layout']!=100)       {
+                       $infoArr = Array();
+                       $this->getProcessedValue('tt_content','header_position,header_layout,header_link',$row,$infoArr);
+
+                       $outHeader=  ($row['date'] ? htmlspecialchars($this->itemLabels['date'].' '.t3lib_BEfunc::date($row['date'])).'<br />':'').
+                                       $this->infoGif($infoArr).
+                                       '<b>'.$this->linkEditContent($this->renderText($row['header']),$row).'</b><br />';
+               }
+
+                       // Make content:
+               $infoArr=Array();
+               switch($row['CType'])   {
+                       case 'header':
+                               if ($row['subheader'])  {
+                                       $this->getProcessedValue('tt_content','layout',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($this->renderText($row['subheader']),$row).'<br />';
+                               }
+                       break;
+                       case 'text':
+                       case 'textpic':
+                       case 'image':
+                               if ($row['CType']=='text' || $row['CType']=='textpic')  {
+                                       if ($row['bodytext'])   {
+                                               $this->getProcessedValue('tt_content','text_align,text_face,text_size,text_color,text_properties',$row,$infoArr);
+                                               $out.= $this->infoGif($infoArr).
+                                                               $this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                                       }
+                               }
+                               if ($row['CType']=='textpic' || $row['CType']=='image') {
+                                       if ($row['image'])      {
+                                               $infoArr=Array();
+                                               $this->getProcessedValue('tt_content','imageorient,imagecols,image_noRows,imageborder,imageheight,image_link,image_zoom,image_compression,image_effects,image_frames',$row,$infoArr);
+                                               $out.=  $this->infoGif($infoArr).
+                                                               $this->thumbCode($row,'tt_content','image').'<br />';
+
+                                               if ($row['imagecaption'])       {
+                                                       $infoArr=Array();
+                                                       $this->getProcessedValue('tt_content','imagecaption_position',$row,$infoArr);
+                                                       $out.=  $this->infoGif($infoArr).
+                                                                       $this->linkEditContent($this->renderText($row['imagecaption']),$row).'<br />';
+                                               }
+                                       }
+###########
+                                       if ($row['tx_damttcontent_files'])      {
+                                               require_once(PATH_txdam.'lib/class.tx_dam_image.php');
+                                               require_once(PATH_txdam.'lib/class.tx_dam_tcefunc.php');
+                                               require_once(PATH_txdam.'lib/class.tx_dam_guifunc.php');
+                                               $config = $TCA['tt_content']['columns']['tx_damttcontent_files']['config'];
+                                               $filesArray = tx_dam_db::getReferencedFiles('tt_content', $row['uid'], $config['MM_match_fields'], $config['MM'], 'tx_dam.*');
+                                               foreach($filesArray['rows'] as $rowDAM) {
+                                                       $caption = tx_dam_guiFunc::meta_compileInfoData($rowDAM, '_caption:truncate:100', 'value-string');
+                                                       
+                                                       #$imgAttributes['title'] = tx_dam_guiFunc::meta_compileHoverText($rowDAM);
+                                                       #$thumb = tx_dam_image::previewImgTag($rowDAM, '', $imgAttributes);
+                                                       $thumb = tx_dam_guiFunc::thumbnail($rowDAM);
+                                                       $thumb = '<div style="float:left;width:56px; overflow:auto; margin: 2px 5px 2px 0; padding: 5px; background-color:#fff; border:solid 1px #ccc;">'.$thumb.'</div>';
+                                                       $thumb = '<div>'.$thumb.$caption.'</div><div style="clear:both"></div>';
+                                                       
+                                                       
+                                                       
+                                                       $out.= $thumb;
+                                               }
+                                       }
+#############
+                               }
+                       break;
+                       case 'bullets':
+                               if ($row['bodytext'])   {
+                                       $this->getProcessedValue('tt_content','layout,text_align,text_face,text_size,text_color,text_properties',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               }
+                       break;
+                       case 'table':
+                               if ($row['bodytext'])   {
+                                       $this->getProcessedValue('tt_content','table_bgColor,table_border,table_cellspacing,cols,layout,text_align,text_face,text_size,text_color,text_properties',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               }
+                       break;
+                       case 'uploads':
+                               if ($row['media'])      {
+                                       $this->getProcessedValue('tt_content','media,select_key,layout,filelink_size,table_bgColor,table_border,table_cellspacing',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               }
+                       break;
+                       case 'multimedia':
+                               if ($row['multimedia']) {
+                                       $out.=  $this->renderText($row['multimedia']).'<br />';
+                                       $out.=  $this->renderText($row['parameters']).'<br />';
+                               }
+                       break;
+                       case 'mailform':
+                               if ($row['bodytext'])   {
+                                       $this->getProcessedValue('tt_content','pages,subheader',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               }
+                       break;
+                       case 'splash':
+                               if ($row['bodytext'])   {
+                                       $out.=  $this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               }
+                               if ($row['image'])      {
+                                       $infoArr=Array();
+                                       $this->getProcessedValue('tt_content','imagewidth',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->thumbCode($row,'tt_content','image').'<br />';
+                               }
+                       break;
+                       case 'menu':
+                               if ($row['pages'])      {
+                                       $this->getProcessedValue('tt_content','menu_type',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($row['pages'],$row).'<br />';
+                               }
+                       break;
+                       case 'shortcut':
+                               if ($row['records'])    {
+                                       $this->getProcessedValue('tt_content','layout',$row,$infoArr);
+                                       $out.=  $this->infoGif($infoArr).
+                                                       $this->linkEditContent($row['shortcut'],$row).'<br />';
+                               }
+                       break;
+                       case 'list':
+                               $this->getProcessedValue('tt_content','layout',$row,$infoArr);
+                               $out.=  $this->infoGif($infoArr).
+                                               $GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel('tt_content','list_type'),1).' '.
+                                               $GLOBALS['LANG']->sL(t3lib_BEfunc::getLabelFromItemlist('tt_content','list_type',$row['list_type']),1).'<br />';
+
+                               $out.=  $GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel('tt_content','select_key'),1).' '.$row['select_key'].'<br />';
+
+                               $infoArr=Array();
+                               $this->getProcessedValue('tt_content','recursive',$row,$infoArr);
+                               $out.=  $this->infoGif($infoArr).
+                                               $GLOBALS['LANG']->sL(t3lib_BEfunc::getLabelFromItemlist('tt_content','pages',$row['pages']),1).'<br />';
+                       break;
+                       case 'script':
+                               $out.=  $GLOBALS['LANG']->sL(t3lib_BEfunc::getItemLabel('tt_content','select_key'),1).' '.$row['select_key'].'<br />';
+                               $out.=  '<br />'.$this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               $out.=  '<br />'.$this->linkEditContent($this->renderText($row['imagecaption']),$row).'<br />';
+                       break;
+                       default:
+                               if ($row['bodytext'])   {
+                                       $out.=$this->linkEditContent($this->renderText($row['bodytext']),$row).'<br />';
+                               }
+                       break;
+               }
+
+                       // Wrap span-tags:
+               $out = '
+                       <span class="exampleContent">'.$out.'</span>';
+                       // Add header:
+               $out = $outHeader.$out;
+                       // Add RTE button:
+               if ($isRTE) {
+                       $out.= $this->linkRTEbutton($row);
+               }
+
+                       // Return values:
+               if ($this->isDisabled('tt_content',$row))       {
+                       return $GLOBALS['TBE_TEMPLATE']->dfw($out);
+               } else {
+                       return $out;
+               }
+       }
+
+}
+
+
+
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/class.ux_tx_cms_layout.php'])   {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/class.ux_tx_cms_layout.php']);
+}
+?>
index fc21713..d176917 100644 (file)
Binary files a/doc/manual.sxw and b/doc/manual.sxw differ
index 100cafb..fa5371a 100644 (file)
@@ -6,5 +6,7 @@ ctype_image_add_orig_field = 1
 ctype_textpic_add_ref = 1
   # cat=basic/enable; type=boolean; label=CType Text w/image: Enable original file field for the content type "Text w/image" as second image field.
 ctype_textpic_add_orig_field = 1
-  # cat=basic/enable; type=boolean; label=Alternative CSS Styled Rendering: Enable alternative rendering for css_styled_content to .
+  # cat=basic/enable; type=boolean; label=Alternative CSS Styled Rendering: Enable alternative rendering for css_styled_content to.
 add_css_styled_hook = 1
+  # cat=basic/enable; type=boolean; label=Page module modifications: Enable modifications to the page module (XCLASS) to enable the display of thumbnails for reference fields.
+add_page_mod_xclass = 1
index e864760..43e4b55 100644 (file)
 
 $EM_CONF[$_EXTKEY] = array(
        'title' => 'DAM for Content Elements',
-       'description' => 'Enhance some of the default content elements to make use of DAM functionality. Eg. modify the content types "Image" and "Text/Image" for usage of the DAM.',
+       'description' => 'Enhance some of the default content elements to make use of DAM functionality. Eg. modify the content types "Image" and "Text/Image" for usage of the DAM. This depends on TYPO3 4.1 or the extension \'mmforeign\'.',
        'category' => 'fe',
        'shy' => 0,
        'version' => '1.0.100',
-       'dependencies' => 'cms,dam,mmforeign',
+       'dependencies' => 'cms,dam',
        'conflicts' => '',
        'priority' => '',
        'loadOrder' => '',
@@ -36,7 +36,6 @@ $EM_CONF[$_EXTKEY] = array(
                'depends' => array(
                        'cms' => '',
                        'dam' => '',
-                       'mmforeign' => '',
                        'php' => '4.0.0-',
                        'typo3' => '3.8.0-',
                ),
index ac14aed..485ad25 100644 (file)
@@ -1,9 +1,9 @@
 <?php
 
-$GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup'] = unserialize($_EXTCONF);
+$GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup'] = unserialize($_EXTCONF);
 
 
-if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_image_add_ref']) {
+if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctype_image_add_ref']) {
 
        t3lib_extMgm::addTypoScript($_EXTKEY,'setup','
                includeLibs.tx_damttcontent = EXT:dam/lib/class.tx_dam_tsfe.php
@@ -20,7 +20,7 @@ if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_image_add_ref'])
 
                        additional.fileList < temp.tx_dam.fileList
                        additional.filePath < tt_content.image.20.imgPath
-                       '.($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_image_add_orig_field']?'':'additional >').'
+                       '.($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctype_image_add_orig_field']?'':'additional >').'
                }
                tt_content.image.20.imgPath >
                tt_content.image.20.imgPath =
@@ -28,7 +28,7 @@ if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_image_add_ref'])
        ',43);
 }
 
-if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_textpic_add_ref']) {
+if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctype_textpic_add_ref']) {
 
        t3lib_extMgm::addTypoScript($_EXTKEY,'setup','
                includeLibs.tx_damttcontent = EXT:dam/lib/class.tx_dam_tsfe.php
@@ -45,7 +45,7 @@ if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_textpic_add_ref']
 
                        additional.fileList < temp.tx_dam.fileList
                        additional.filePath < tt_content.textpic.20.imgPath
-                       '.($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_textpic_add_orig_field']?'':'additional >').'
+                       '.($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['ctype_textpic_add_orig_field']?'':'additional >').'
                }
                tt_content.textpic.20.imgPath >
                tt_content.textpic.20.imgPath =
@@ -54,8 +54,13 @@ if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['ctype_textpic_add_ref']
 }
 
 
-if ($GLOBALS['T3_VAR']['ext']['dam_ttcontent']['setup']['add_css_styled_hook']) {
+if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['add_css_styled_hook']) {
        $TYPO3_CONF_VARS['EXTCONF']['css_styled_content']['pi1_hooks']['render_textpic'] = 'EXT:dam_ttcontent/pi_cssstyledcontent/class.tx_damttcontent_pi1.php:&tx_damttcontent_pi1';
 }
 
+
+if ($GLOBALS['T3_VAR']['ext'][$_EXTKEY]['setup']['add_page_mod_xclass']) {
+       $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/cms/layout/class.tx_cms_layout.php'] = t3lib_extMgm::extPath('dam_ttcontent').'class.ux_tx_cms_layout.php';
+}
+
 ?>
\ No newline at end of file
index d478d73..b05c79a 100755 (executable)
@@ -565,7 +565,7 @@ class tx_damttcontent_pi1 extends tx_cssstyledcontent_pi1 {
 
 
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/pi1/class.tx_damttcontent_pi1.php'])    {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/pi1/class.tx_damttcontent_pi1.php']);
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/pi_cssstyledcontent/class.tx_damttcontent_pi1.php'])    {
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dam_ttcontent/pi_cssstyledcontent/class.tx_damttcontent_pi1.php']);
 }
 ?>
\ No newline at end of file
index 4631e91..fa61333 100755 (executable)
@@ -15,10 +15,12 @@ tt_content.image.20 {
                altText >
                altText = TEXT
                altText.data = field : txdam_alt_text // field : altText
+#              altText.data = field : altText // field : txdam_alt_text
 
                titleText >
                titleText = TEXT
                titleText.data = field : txdam_title // field : titleText
+#              titleText.data = field : titleText // field : txdam_title
        }
 
        captionEach = {$styles.content.imgtext.captionEach}
@@ -27,6 +29,7 @@ tt_content.image.20 {
                1 {
                        field >
                        data = field : txdam_caption // field : txdam_description // field : imagecaption
+#                      data = field : imagecaption // field : txdam_caption // field : txdam_description
                        required = 1
                        parseFunc =< lib.parseFunc
                        br = 1
@@ -36,3 +39,4 @@ tt_content.image.20 {
                }
        }
 }
+