[TASK] Remove content element "textbox"
authorGeorg Ringer <georg.ringer@gmail.com>
Sat, 22 Sep 2012 17:40:28 +0000 (19:40 +0200)
committerGeorg Ringer <georg.ringer@gmail.com>
Sat, 22 Sep 2012 21:22:54 +0000 (23:22 +0200)
Remove the content element type "textbox" / "splash".

Change-Id: Id4fd8f4f4c10fee39de4940f96f772ba2d173774
Resolves: #41142
Releases: 6.0
Reviewed-on: http://review.typo3.org/14801
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
typo3/sysext/backend/Classes/View/PageLayoutView.php
typo3/sysext/cms/ext_tables.php
typo3/sysext/cms/ext_tables.sql
typo3/sysext/cms/tbl_tt_content.php
typo3/sysext/core/Classes/Extension/ExtensionManager.php
typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
typo3/sysext/css_styled_content/pageTSconfig.txt
typo3/sysext/css_styled_content/static/constants.txt
typo3/sysext/css_styled_content/static/setup.txt
typo3/sysext/statictemplates/media/scripts/postit.inc [deleted file]
typo3/sysext/t3editor/res/jslib/parse_typoscript/tokenizetyposcript.js

index cea48e5..a26f177 100644 (file)
@@ -1253,14 +1253,6 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                        $out .= $this->renderText($row['parameters']) . '<br />';
                                }
                                break;
-                       case 'splash':
-                               if ($row['bodytext']) {
-                                       $out .= $this->linkEditContent($this->renderText($row['bodytext']), $row) . '<br />';
-                               }
-                               if ($row['image']) {
-                                       $out .= $this->thumbCode($row, 'tt_content', 'image') . '<br />';
-                               }
-                               break;
                        case 'menu':
                                if ($row['pages']) {
                                        $out .= $this->linkEditContent($row['pages'], $row) . '<br />';
@@ -1919,4 +1911,4 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 }
 
 
-?>
+?>
\ No newline at end of file
index e9a0cf5..8b6ed35 100755 (executable)
@@ -47,7 +47,6 @@ $TCA['tt_content'] = array(
                        'image' => 'mimetypes-x-content-image',
                        'bullets' => 'mimetypes-x-content-list-bullets',
                        'table' => 'mimetypes-x-content-table',
-                       'splash' => 'mimetypes-x-content-splash',
                        'uploads' => 'mimetypes-x-content-list-files',
                        'multimedia' => 'mimetypes-x-content-multimedia',
                        'media' => 'mimetypes-x-content-multimedia',
@@ -69,7 +68,6 @@ $TCA['tt_content'] = array(
                        'image' => 'tt_content_image.gif',
                        'bullets' => 'tt_content_bullets.gif',
                        'table' => 'tt_content_table.gif',
-                       'splash' => 'tt_content_news.gif',
                        'uploads' => 'tt_content_uploads.gif',
                        'multimedia' => 'tt_content_mm.gif',
                        'media' => 'tt_content_mm.gif',
index 3346f53..f322c0b 100755 (executable)
@@ -335,7 +335,6 @@ CREATE TABLE tt_content (
   target varchar(30) DEFAULT '' NOT NULL,
   section_frame int(11) unsigned DEFAULT '0' NOT NULL,
   date int(10) unsigned DEFAULT '0' NOT NULL,
-  splash_layout varchar(30) DEFAULT '0' NOT NULL,
   multimedia tinytext,
   image_frames int(11) unsigned DEFAULT '0' NOT NULL,
   recursive tinyint(3) unsigned DEFAULT '0' NOT NULL,
index 7775577..f5ed589 100755 (executable)
@@ -119,11 +119,6 @@ $TCA['tt_content'] = array(
                                                'i/tt_content_mm.gif'
                                        ),
                                        array(
-                                               'LLL:EXT:cms/locallang_ttc.xml:CType.I.11',
-                                               'splash',
-                                               'i/tt_content_news.gif'
-                                       ),
-                                       array(
                                                'LLL:EXT:cms/locallang_ttc.xml:CType.I.12',
                                                'menu',
                                                'i/tt_content_menu.gif'
@@ -1597,40 +1592,6 @@ $TCA['tt_content'] = array(
                                'default' => '0'
                        )
                ),
-               'splash_layout' => array(
-                       'exclude' => 1,
-                       'label' => 'LLL:EXT:cms/locallang_ttc.xml:splash_layout',
-                       'config' => array(
-                               'type' => 'select',
-                               'items' => array(
-                                       array(
-                                               'LLL:EXT:lang/locallang_general.xml:LGL.default_value',
-                                               '0'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xml:splash_layout.I.1',
-                                               '1'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xml:splash_layout.I.2',
-                                               '2'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xml:splash_layout.I.3',
-                                               '3'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xml:splash_layout.I.4',
-                                               '--div--'
-                                       ),
-                                       array(
-                                               'LLL:EXT:cms/locallang_ttc.xml:splash_layout.I.5',
-                                               '20'
-                                       )
-                               ),
-                               'default' => '0'
-                       )
-               ),
                'sectionIndex' => array(
                        'exclude' => 1,
                        'label' => 'LLL:EXT:cms/locallang_ttc.xml:sectionIndex',
@@ -1833,17 +1794,6 @@ $TCA['tt_content'] = array(
                                        --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
                                --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
                ),
-               'splash' => array(
-                       'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.header;header,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.textbox;textbox,
-                               --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.appearance,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.frames;frames,
-                               --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.access,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.visibility;visibility,
-                                       --palette--;LLL:EXT:cms/locallang_ttc.xml:palette.access;access,
-                               --div--;LLL:EXT:cms/locallang_ttc.xml:tabs.extended'
-               ),
                // file list
                'uploads' => array(
                        'showitem' => '--palette--;LLL:EXT:cms/locallang_ttc.xml:palette.general;general,
@@ -2050,10 +2000,6 @@ $TCA['tt_content'] = array(
                        'showitem' => 'multimedia;LLL:EXT:cms/locallang_ttc.xml:multimedia_formlabel, bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.multimedia_formlabel;;nowrap',
                        'canNotCollapse' => 1
                ),
-               'textbox' => array(
-                       'showitem' => 'splash_layout;LLL:EXT:cms/locallang_ttc.xml:splash_layout_formlabel, image;LLL:EXT:cms/locallang_ttc.xml:image.ALT.textbox_formlabel, --linebreak--, bodytext;LLL:EXT:cms/locallang_ttc.xml:bodytext.ALT.textbox_formlabel',
-                       'canNotCollapse' => 1
-               ),
                'imagelinks' => array(
                        'showitem' => 'image_zoom;LLL:EXT:cms/locallang_ttc.xml:image_zoom_formlabel',
                        'canNotCollapse' => 1
@@ -2152,4 +2098,4 @@ if ((!isset($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone']['Tx_Install_Upd
                'minitems' => '0'
        );
 }
-?>
+?>
\ No newline at end of file
index 3b3bbbd..60dc41f 100644 (file)
@@ -1222,7 +1222,6 @@ class ExtensionManager {
         * $type determines the type of frontend plugin:
         * "list_type" (default)        - the good old "Insert plugin" entry
         * "menu_type"  - a "Menu/Sitemap" entry
-        * "splash_layout" - a "Textbox" entry
         * "CType" - a new content element type
         * "header_layout" - an additional header type (added to the selection of layout1-5)
         * "includeLib" - just includes the library for manual use somewhere in TypoScript.
@@ -1257,9 +1256,6 @@ plugin.' . $cN . $prefix . ' {
                case 'menu_type':
                        $addLine = 'tt_content.menu.20.' . $key . $prefix . ' = < plugin.' . $cN . $prefix;
                        break;
-               case 'splash_layout':
-                       $addLine = 'tt_content.splash.' . $key . $prefix . ' = < plugin.' . $cN . $prefix;
-                       break;
                case 'CType':
                        $addLine = trim('
 tt_content.' . $key . $prefix . ' = COA
index ef41d5f..5182cd0 100644 (file)
@@ -91,7 +91,6 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
                'cmailform' => array('Content: \'Form\'', 'mi'),
                'csearch' => array('Content: \'Search\'', 'mj'),
                'clogin' => array('Content: \'Login\'', 'mk'),
-               'csplash' => array('Content: \'Textbox\'', 'ml'),
                'cmenu' => array('Content: \'Menu/Sitemap\'', 'mm'),
                'cshortcut' => array('Content: \'Insert records\'', 'mn'),
                'clist' => array('Content: \'List of records\'', 'mo'),
@@ -1592,4 +1591,4 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
 }
 
 
-?>
+?>
\ No newline at end of file
index d25d9da..7493e07 100755 (executable)
@@ -13,7 +13,7 @@ TCEFORM.tt_content {
        text_size.disabled=1
        image_frames.disabled = 1
 
-       CType.removeItems = rte,splash,swfobject,qtobject,multimedia
+       CType.removeItems = swfobject,qtobject,multimedia
 }
 
 
index 79ac330..8dfb333 100644 (file)
@@ -13,8 +13,6 @@ content {
   spaceBefore = 0
     # cat=content/other/b; type=small; label= Content Element margins (after): Space after each content element.
   spaceAfter = 0
-
-  splash.bgCol = white
 }
 
 
index 9e057e5..53b9d29 100644 (file)
@@ -1725,64 +1725,6 @@ tt_content.search.30 {
        }
 }
 
-# ******************
-# CType: splash
-# ******************
-# Deprecated element.
-# Still here for backwards compliance with plugins using the "text box" type.
-tt_content.splash = CASE
-tt_content.splash.key.field = splash_layout
-tt_content.splash.stdWrap {
-       prefixComment = 2 | Textbox inserted (Deprecated)
-}
-tt_content.splash.default = COA
-tt_content.splash.default {
-       20 = CTABLE
-       20 {
-               c.1 = < tt_content.text
-               lm.1 = IMAGE
-               lm.1.file {
-                       import = uploads/pics/
-                       import.field = image
-                       import.listNum = 0
-                       maxW.field = imagewidth
-                       maxW.ifEmpty = 200
-               }
-               cMargins = 30,0,0,0
-       }
-}
-tt_content.splash.1 < tt_content.splash.default
-tt_content.splash.1.20.lm.1.file >
-tt_content.splash.1.20.lm.1.file = GIFBUILDER
-tt_content.splash.1.20.lm.1.file {
-       XY = [10.w]+10,[10.h]+10
-       backColor = {$content.splash.bgCol}
-       backColor.override.data = register:pageColor
-       format = jpg
-       5 = BOX
-       5.dimensions = 3,3,[10.w],[10.h]
-       5.color = #333333
-       7 = EFFECT
-       7.value = blur=99|blur=99|blur=99|blur=99|blur=99|blur=99|blur=99
-       10 = IMAGE
-       10.file {
-               import = uploads/pics/
-               import.field = image
-               import.listNum = 0
-               maxW.field = imagewidth
-               maxW.ifEmpty = 200
-       }
-}
-// The image frames are not available unless TypoScript code from styles.content.imgFrames.x is provided manually:
-tt_content.splash.2 < tt_content.splash.default
-#tt_content.splash.2.20.lm.1.file.m < styles.content.imgFrames.1
-tt_content.splash.3 < tt_content.splash.default
-#tt_content.splash.3.20.lm.1.file.m < styles.content.imgFrames.2
-
-// From plugin.postit1, if included:
-tt_content.splash.20 = < plugin.postit1
-
-
 
 # ****************
 # CType: menu
diff --git a/typo3/sysext/statictemplates/media/scripts/postit.inc b/typo3/sysext/statictemplates/media/scripts/postit.inc
deleted file mode 100644 (file)
index 38e94b7..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 1999-2009 Kasper Skårhøj (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!
- ***************************************************************/
-/**
- * postit.inc
- *
- * Creates graphical postit notes with text on them.
- *
- * Revised for TYPO3 3.6 June/2003 by Kasper Skårhøj
- * XHTML compliant
- *
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- */
-if (!is_object($this)) {
-       die('Error: No parent object present.');
-}
-/***************************************************************
-TypoScript config:.data                [string / stdWrap]              The data for the notes. Every line is a new note. Each line is divided by "|" where the first part is the test, the second part is the type (1-) and the third part is the optional link (typolink-format)
-.charsPerLine  [string]                        The max number of chars per line of text on the note.
-.images.[x]            [image-contentObjects]   [x] is the type-number defined by the second parameter in each line of data.
-.textBox {
-chars                                          integer, the number of chars on each line
-lineDist                                       integer, the number of pixels between each line
-tmplObjNumber                          integer, pointer to the GIFBUILDER-OBJECT (of type TEXT!!) which serves as a TEMPLATE for the objects used to create the textlines
-Valign                                                 string. If set to "center", the tmplObjNumber-TEXT-object is expected to be centeret in the image and calculations will be done to spred the lines above and below in case of multiple lines. (based on .angle of the TEXT object also.)
-maxLines
-}Example:// Postit:
-tt_content.splash.20 = PHP_SCRIPT
-tt_content.splash.20 {
-file = media/scripts/postit.inc
-data.field = bodytext
-cols = 3
-textBox {
-chars = 16
-lineDist = 18
-tmplObjNumber = 100
-Valign = center
-maxLines = 5
-}
-typolink {
-parameter.current = 1
-extTarget = {$styles.content.links.extTarget}
-target = {$styles.content.links.target}
-}
-images.1 = IMAGE
-images.1.file = GIFBUILDER
-images.1.file {
-XY = [5.w],[5.h]
-5 = IMAGE
-5.file = media/uploads/postit_1.gif
-100 = TEXT
-100.text = Testing
-100.offset = -5,60
-100.fontFile = fileadmin/fonts/arial_bold.ttf
-100.fontSize = 15
-100.align=center
-}
-images.2 < .images.1
-images.2.file.5.file = media/uploads/postit_2.gif
-images.2.file.100.angle = 11
-images.2.file.100.offset = -2,79
-images.3 < .images.1
-images.3.file.5.file = media/uploads/postit_3.gif
-images.3.file.100.angle = -13
-images.3.file.100.offset = -7,81
-}****************************************************************/
-$data = $this->stdWrap($conf['data'], $conf['data.']);
-$cols = intval($conf['cols']) ? intval($conf['cols']) : 3;
-$lines = explode(chr(10), $data);
-$imageArr = array();
-foreach ($lines as $key => $content) {
-       $content = trim($content);
-       if ($content) {
-               $parts = explode('|', $content);
-               $text = trim($parts[0]);
-               $type = t3lib_utility_Math::forceIntegerInRange($parts[1], 1, 3);
-               $link = trim($parts[2]);
-               if ($text) {
-                       $imgConf = $conf['images.'][$type . '.'];
-                       $imgConf['file.'] = $this->gifBuilderTextBox($imgConf['file.'], $conf['textBox.'], $text);
-                       $image = $this->IMAGE($imgConf);
-                       if ($image) {
-                               $this->setCurrentVal($link);
-                               $imageArr[] = $this->typolink($image, $conf['typolink.']);
-                       }
-               }
-       }
-}
-if (is_array($imageArr)) {
-       reset($imageArr);
-       if ($cols) {
-               $res = '';
-               $rows = ceil(count($imageArr) / $cols);
-               for ($a = 0; $a < $rows; $a++) {
-                       $res .= '<tr>';
-                       for ($b = 0; $b < $cols; $b++) {
-                               $res .= ('<td>' . $imageArr[($a * $cols + $b)]) . '</td>';
-                       }
-                       $res .= '</tr>';
-               }
-               $content = ('<table border="0" cellspacing="0" cellpadding="0">' . $res) . '</table>';
-       } else {
-               $content .= implode($imageArr, '');
-       }
-}
-?>
\ No newline at end of file
index 0882a27..910db0c 100644 (file)
@@ -1057,7 +1057,6 @@ var typoscriptWords = {
        'shortcut': 'keyword3',
        'sitemap': 'keyword3',
        'SPC': 'keyword3',
-       'splash': 'keyword3',
        'sys_dmail': 'keyword3',
        'sys_domain': 'keyword3',
        'sys_filemounts': 'keyword3',
@@ -2388,7 +2387,6 @@ var typoscriptWords = {
        'shortcut': 'keyword3',
        'sitemap': 'keyword3',
        'SPC': 'keyword3',
-       'splash': 'keyword3',
        'sys_dmail': 'keyword3',
        'sys_domain': 'keyword3',
        'sys_filemounts': 'keyword3',