[!!!][TASK] Form project structure is not Extbase-compliant
authorOliver Hader <oliver@typo3.org>
Sun, 23 Oct 2011 17:57:09 +0000 (19:57 +0200)
committerOliver Hader <oliver@typo3.org>
Sun, 23 Oct 2011 21:51:39 +0000 (23:51 +0200)
Directory is moved from Resources/Private/Configuration -> Configuration
If the static TypoScript resource was already included in a template, it
needs to be updated manually again since this is a breaking change.

Change-Id: I018832f7320695a57297add2df911827caa5e04a
Fixes: #31196
Reviewed-on: http://review.typo3.org/6200
Reviewed-by: Xavier Perseguers
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
typo3/sysext/form/Classes/Common.php
typo3/sysext/form/Configuration/PageTS/modWizards.ts [new file with mode: 0644]
typo3/sysext/form/Configuration/TypoScript/setup.txt [new file with mode: 0644]
typo3/sysext/form/Resources/Private/Configuration/PageTSconfig/modWizards.ts [deleted file]
typo3/sysext/form/Resources/Private/Configuration/TypoScript/setup.txt [deleted file]
typo3/sysext/form/ext_tables.php

index 67a5c15..9562e33 100644 (file)
@@ -118,7 +118,7 @@ class tx_form_Common implements t3lib_Singleton {
         */
        public function initializePageTsConfig() {
                t3lib_extMgm::addPageTSConfig(
-                       '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Resources/Private/Configuration/PageTSconfig/modWizards.ts">'
+                       '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:form/Configuration/PageTS/modWizards.ts">'
                );
 
                return $this;
diff --git a/typo3/sysext/form/Configuration/PageTS/modWizards.ts b/typo3/sysext/form/Configuration/PageTS/modWizards.ts
new file mode 100644 (file)
index 0000000..131eab1
--- /dev/null
@@ -0,0 +1,281 @@
+mod.wizards {
+       newContentElement.wizardItems {
+               forms.elements {
+                       mailform {
+                               tt_content_defValues {
+                                       bodytext (
+enctype = multipart/form-data
+method = post
+prefix = tx_form
+                                       )
+                               }
+                       }
+               }
+       }
+       form {
+               defaults {
+                       showTabs = elements, options, form
+                       tabs {
+                               elements {
+                                       showAccordions = basic, predefined, content
+                                       accordions {
+                                               basic {
+                                                       showButtons = checkbox, fieldset, fileupload, hidden, password, radio, reset, select, submit, textarea, textline
+                                               }
+                                               predefined {
+                                                       showButtons = email, radiogroup, checkboxgroup, name
+                                               }
+                                               content {
+                                                       showButtons = header, textblock
+                                               }
+                                       }
+                               }
+                               options {
+                                       showAccordions = legend, label, attributes, options, validation, filters, various
+                                       accordions {
+                                               attributes {
+                                                       showProperties = accept, acceptcharset, accesskey, action, alt, checked, class, cols, dir, disabled, enctype, id, label, lang, maxlength, method, multiple, name, readonly, rows, selected, size, src, style, tabindex, title, type, value
+                                               }
+                                               label {
+                                                       showProperties = label
+                                               }
+                                               validation {
+                                                       showRules = alphabetic, alphanumeric, between, date, digit, email, equals, fileallowedtypes, filemaximumsize, fileminimumsize, float, greaterthan, inarray, integer, ip, length, lessthan, regexp, required, uri
+                                                       rules {
+                                                               alphabetic {
+                                                                       showProperties = message, error, breakOnError, showMessage, allowWhiteSpace
+                                                               }
+                                                               alphanumeric {
+                                                                       showProperties = message, error, breakOnError, showMessage, allowWhiteSpace
+                                                               }
+                                                               between {
+                                                                       showProperties = message, error, breakOnError, showMessage, minimum, maximum, inclusive
+                                                               }
+                                                               date {
+                                                                       showProperties = message, error, breakOnError, showMessage, format
+                                                               }
+                                                               digit {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                               email {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                               equals {
+                                                                       showProperties = message, error, breakOnError, showMessage, field
+                                                               }
+                                                               fileallowedtypes {
+                                                                       showProperties = message, error, breakOnError, showMessage, types
+                                                               }
+                                                               filemaximumsize {
+                                                                       showProperties = message, error, breakOnError, showMessage, maximum
+                                                               }
+                                                               fileminimumsize {
+                                                                       showProperties = message, error, breakOnError, showMessage, minimum
+                                                               }
+                                                               float {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                               greaterthan {
+                                                                       showProperties = message, error, breakOnError, showMessage, minimum
+                                                               }
+                                                               inarray {
+                                                                       showProperties = message, error, breakOnError, showMessage, array, strict
+                                                               }
+                                                               integer {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                               ip {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                               length {
+                                                                       showProperties = message, error, breakOnError, showMessage, minimum, maximum
+                                                               }
+                                                               lessthan {
+                                                                       showProperties = message, error, breakOnError, showMessage, maximum
+                                                               }
+                                                               regexp {
+                                                                       showProperties = message, error, breakOnError, showMessage, expression
+                                                               }
+                                                               required {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                               uri {
+                                                                       showProperties = message, error, breakOnError, showMessage
+                                                               }
+                                                       }
+                                               }
+                                               filtering {
+                                                       showFilters = alphabetic, alphanumeric, currency, digit, integer, lowercase, regexp, removexss, stripnewlines, titlecase, trim, uppercase
+                                                       filters {
+                                                               alphabetic {
+                                                                       showProperties = allowWhiteSpace
+                                                               }
+                                                               alphanumeric {
+                                                                       showProperties = allowWhiteSpace
+                                                               }
+                                                               currency {
+                                                                       showProperties = decimalPoint, thousandSeparator
+                                                               }
+                                                               digit {
+                                                                       showProperties =
+                                                               }
+                                                               integer {
+                                                                       showProperties =
+                                                               }
+                                                               lowercase {
+                                                                       showProperties =
+                                                               }
+                                                               regexp {
+                                                                       showProperties = expression
+                                                               }
+                                                               removexss {
+                                                                       showProperties =
+                                                               }
+                                                               stripnewlines {
+                                                                       showProperties =
+                                                               }
+                                                               titlecase {
+                                                                       showProperties =
+                                                               }
+                                                               trim {
+                                                                       showProperties = characterList
+                                                               }
+                                                               uppercase {
+                                                                       showProperties =
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               form {
+                                       showAccordions = prefix, attributes, postProcessor
+                                       accordions {
+                                               attributes {
+                                                       showProperties = accept, acceptcharset, action, class, dir, enctype, id, lang, method, name, style, title
+                                               }
+                                               postProcessor {
+                                                       showPostProcessors = mail
+                                                       postProcessors {
+                                                               mail {
+                                                                       showProperties = recipientEmail, senderEmail
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               }
+               elements {
+                       button {
+                               showAccordions = attributes
+                               accordions {
+                                       attributes {
+                                               showProperties = value
+                                       }
+                               }
+                       }
+                       checkbox {
+                               showAccordions = label, attributes
+                               accordions {
+                                       attributes {
+                                               showProperties = name, value
+                                       }
+                               }
+                       }
+                       fieldset {
+                               showAccordions = legend
+                       }
+                       fileupload {
+                               showAccordions = label, attributes, validation
+                               accordions {
+                                       attributes {
+                                               showProperties = name
+                                       }
+                                       validation {
+                                               showRules = required, fileallowedtypes, filemaximumsize, fileminimumsize
+                                       }
+                               }
+                       }
+                       hidden {
+                               showAccordions = attributes
+                               accordions {
+                                       attributes {
+                                               showProperties = name, value
+                                       }
+                               }
+                       }
+                       password {
+                               showAccordions = label, attributes, validation
+                               accordions {
+                                       attributes {
+                                               showProperties = name
+                                       }
+                                       validation {
+                                               showRules = required, equals
+                                       }
+                               }
+                       }
+                       radio < .checkbox
+                       reset < .button
+                       select {
+                               showAccordions = label, attributes, options, validation
+                               accordions {
+                                       attributes {
+                                               showProperties = name, multiple
+                                       }
+                                       validation {
+                                               showRules = required
+                                       }
+                               }
+                       }
+                       submit < .button
+                       textarea {
+                               showAccordions = label, attributes, validation, filters
+                               accordions {
+                                       attributes {
+                                               showProperties = name, cols, rows
+                                       }
+                                       filtering {
+                                               showFilters = alphabetic, alphanumeric, lowercase, regexp, stripnewlines, titlecase, trim, uppercase
+                                       }
+                                       validation {
+                                               showRules = alphabetic, alphanumeric, length, regexp, required
+                                       }
+                               }
+                       }
+                       textline {
+                               showAccordions = label, attributes, validation, filters
+                               accordions {
+                                       attributes {
+                                               showProperties = name
+                                       }
+                                       validation {
+                                               showRules = alphabetic, alphanumeric, between, date, digit, email, equals, float, greaterthan, inarray, integer, ip, length, lessthan, regexp, required, uri
+                                       }
+                                       filtering {
+                                               showFilters = alphabetic, alphanumeric, currency, digit, integer, lowercase, regexp, titlecase, trim, uppercase
+                                       }
+                               }
+                       }
+                       checkboxgroup {
+                               showAccordions = legend, options, various, validation
+                               accordions {
+                                       validation {
+                                               showRules = required
+                                       }
+                               }
+                       }
+                       email < .textline
+                       header {
+                               showAccordions = various
+                       }
+                       textblock {
+                               showAccordions = various
+                       }
+                       name {
+                               showAccordions = legend, various
+                       }
+                       radiogroup < .checkboxgroup
+               }
+       }
+}
diff --git a/typo3/sysext/form/Configuration/TypoScript/setup.txt b/typo3/sysext/form/Configuration/TypoScript/setup.txt
new file mode 100644 (file)
index 0000000..393f171
--- /dev/null
@@ -0,0 +1,56 @@
+tt_content.mailform.20 >
+tt_content.mailform.20 = FORM
+tt_content.mailform.20 {
+       stdWrap.wrap = <div class="csc-mailform"> | </div>
+       stdWrap {
+               editIcons = tt_content: bodytext
+               editIcons.iconTitle.data = LLL:EXT:css_styled_content/pi1/locallang.xml:eIcon.form
+
+               prefixComment = 2 | Mail form inserted:
+       }
+}
+
+#tt_content.login.20 >
+#tt_content.login.20 = FORM
+#tt_content.login.20 {
+#      prefix = login
+#      method = post
+#      10 = FIELDSET
+#      10 {
+#              legend = TEXT
+#              legend {
+#                      data = LLL:EXT:css_styled_content/pi1/locallang.xml:login.username
+#              }
+#              10 = TEXTLINE
+#              10 {
+#                      name = user
+#                      id = mailformuser
+#                      size = 20
+#                      label = TEXT
+#                      label {
+#                              data = LLL:EXT:css_styled_content/pi1/locallang.xml:login.username
+#                      }
+#              }
+#              20 = PASSWORD
+#              20 {
+#                      name = pass
+#                      id = mailformpass
+#                      size = 20
+#                      label = TEXT
+#                      label {
+#                              data = LLL:EXT:css_styled_content/pi1/locallang.xml:login.password
+#                      }
+#              }
+#      }
+#      30 = HIDDEN
+#      30 {
+#              name = logintype
+#              id = mailformlogintype
+#      }
+#      20 = SUBMIT
+#      20 {
+#              name = submit
+#              id = mailformsubmit
+#              value = login
+#      }
+#}
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Configuration/PageTSconfig/modWizards.ts b/typo3/sysext/form/Resources/Private/Configuration/PageTSconfig/modWizards.ts
deleted file mode 100644 (file)
index 131eab1..0000000
+++ /dev/null
@@ -1,281 +0,0 @@
-mod.wizards {
-       newContentElement.wizardItems {
-               forms.elements {
-                       mailform {
-                               tt_content_defValues {
-                                       bodytext (
-enctype = multipart/form-data
-method = post
-prefix = tx_form
-                                       )
-                               }
-                       }
-               }
-       }
-       form {
-               defaults {
-                       showTabs = elements, options, form
-                       tabs {
-                               elements {
-                                       showAccordions = basic, predefined, content
-                                       accordions {
-                                               basic {
-                                                       showButtons = checkbox, fieldset, fileupload, hidden, password, radio, reset, select, submit, textarea, textline
-                                               }
-                                               predefined {
-                                                       showButtons = email, radiogroup, checkboxgroup, name
-                                               }
-                                               content {
-                                                       showButtons = header, textblock
-                                               }
-                                       }
-                               }
-                               options {
-                                       showAccordions = legend, label, attributes, options, validation, filters, various
-                                       accordions {
-                                               attributes {
-                                                       showProperties = accept, acceptcharset, accesskey, action, alt, checked, class, cols, dir, disabled, enctype, id, label, lang, maxlength, method, multiple, name, readonly, rows, selected, size, src, style, tabindex, title, type, value
-                                               }
-                                               label {
-                                                       showProperties = label
-                                               }
-                                               validation {
-                                                       showRules = alphabetic, alphanumeric, between, date, digit, email, equals, fileallowedtypes, filemaximumsize, fileminimumsize, float, greaterthan, inarray, integer, ip, length, lessthan, regexp, required, uri
-                                                       rules {
-                                                               alphabetic {
-                                                                       showProperties = message, error, breakOnError, showMessage, allowWhiteSpace
-                                                               }
-                                                               alphanumeric {
-                                                                       showProperties = message, error, breakOnError, showMessage, allowWhiteSpace
-                                                               }
-                                                               between {
-                                                                       showProperties = message, error, breakOnError, showMessage, minimum, maximum, inclusive
-                                                               }
-                                                               date {
-                                                                       showProperties = message, error, breakOnError, showMessage, format
-                                                               }
-                                                               digit {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                               email {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                               equals {
-                                                                       showProperties = message, error, breakOnError, showMessage, field
-                                                               }
-                                                               fileallowedtypes {
-                                                                       showProperties = message, error, breakOnError, showMessage, types
-                                                               }
-                                                               filemaximumsize {
-                                                                       showProperties = message, error, breakOnError, showMessage, maximum
-                                                               }
-                                                               fileminimumsize {
-                                                                       showProperties = message, error, breakOnError, showMessage, minimum
-                                                               }
-                                                               float {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                               greaterthan {
-                                                                       showProperties = message, error, breakOnError, showMessage, minimum
-                                                               }
-                                                               inarray {
-                                                                       showProperties = message, error, breakOnError, showMessage, array, strict
-                                                               }
-                                                               integer {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                               ip {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                               length {
-                                                                       showProperties = message, error, breakOnError, showMessage, minimum, maximum
-                                                               }
-                                                               lessthan {
-                                                                       showProperties = message, error, breakOnError, showMessage, maximum
-                                                               }
-                                                               regexp {
-                                                                       showProperties = message, error, breakOnError, showMessage, expression
-                                                               }
-                                                               required {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                               uri {
-                                                                       showProperties = message, error, breakOnError, showMessage
-                                                               }
-                                                       }
-                                               }
-                                               filtering {
-                                                       showFilters = alphabetic, alphanumeric, currency, digit, integer, lowercase, regexp, removexss, stripnewlines, titlecase, trim, uppercase
-                                                       filters {
-                                                               alphabetic {
-                                                                       showProperties = allowWhiteSpace
-                                                               }
-                                                               alphanumeric {
-                                                                       showProperties = allowWhiteSpace
-                                                               }
-                                                               currency {
-                                                                       showProperties = decimalPoint, thousandSeparator
-                                                               }
-                                                               digit {
-                                                                       showProperties =
-                                                               }
-                                                               integer {
-                                                                       showProperties =
-                                                               }
-                                                               lowercase {
-                                                                       showProperties =
-                                                               }
-                                                               regexp {
-                                                                       showProperties = expression
-                                                               }
-                                                               removexss {
-                                                                       showProperties =
-                                                               }
-                                                               stripnewlines {
-                                                                       showProperties =
-                                                               }
-                                                               titlecase {
-                                                                       showProperties =
-                                                               }
-                                                               trim {
-                                                                       showProperties = characterList
-                                                               }
-                                                               uppercase {
-                                                                       showProperties =
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               form {
-                                       showAccordions = prefix, attributes, postProcessor
-                                       accordions {
-                                               attributes {
-                                                       showProperties = accept, acceptcharset, action, class, dir, enctype, id, lang, method, name, style, title
-                                               }
-                                               postProcessor {
-                                                       showPostProcessors = mail
-                                                       postProcessors {
-                                                               mail {
-                                                                       showProperties = recipientEmail, senderEmail
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               elements {
-                       button {
-                               showAccordions = attributes
-                               accordions {
-                                       attributes {
-                                               showProperties = value
-                                       }
-                               }
-                       }
-                       checkbox {
-                               showAccordions = label, attributes
-                               accordions {
-                                       attributes {
-                                               showProperties = name, value
-                                       }
-                               }
-                       }
-                       fieldset {
-                               showAccordions = legend
-                       }
-                       fileupload {
-                               showAccordions = label, attributes, validation
-                               accordions {
-                                       attributes {
-                                               showProperties = name
-                                       }
-                                       validation {
-                                               showRules = required, fileallowedtypes, filemaximumsize, fileminimumsize
-                                       }
-                               }
-                       }
-                       hidden {
-                               showAccordions = attributes
-                               accordions {
-                                       attributes {
-                                               showProperties = name, value
-                                       }
-                               }
-                       }
-                       password {
-                               showAccordions = label, attributes, validation
-                               accordions {
-                                       attributes {
-                                               showProperties = name
-                                       }
-                                       validation {
-                                               showRules = required, equals
-                                       }
-                               }
-                       }
-                       radio < .checkbox
-                       reset < .button
-                       select {
-                               showAccordions = label, attributes, options, validation
-                               accordions {
-                                       attributes {
-                                               showProperties = name, multiple
-                                       }
-                                       validation {
-                                               showRules = required
-                                       }
-                               }
-                       }
-                       submit < .button
-                       textarea {
-                               showAccordions = label, attributes, validation, filters
-                               accordions {
-                                       attributes {
-                                               showProperties = name, cols, rows
-                                       }
-                                       filtering {
-                                               showFilters = alphabetic, alphanumeric, lowercase, regexp, stripnewlines, titlecase, trim, uppercase
-                                       }
-                                       validation {
-                                               showRules = alphabetic, alphanumeric, length, regexp, required
-                                       }
-                               }
-                       }
-                       textline {
-                               showAccordions = label, attributes, validation, filters
-                               accordions {
-                                       attributes {
-                                               showProperties = name
-                                       }
-                                       validation {
-                                               showRules = alphabetic, alphanumeric, between, date, digit, email, equals, float, greaterthan, inarray, integer, ip, length, lessthan, regexp, required, uri
-                                       }
-                                       filtering {
-                                               showFilters = alphabetic, alphanumeric, currency, digit, integer, lowercase, regexp, titlecase, trim, uppercase
-                                       }
-                               }
-                       }
-                       checkboxgroup {
-                               showAccordions = legend, options, various, validation
-                               accordions {
-                                       validation {
-                                               showRules = required
-                                       }
-                               }
-                       }
-                       email < .textline
-                       header {
-                               showAccordions = various
-                       }
-                       textblock {
-                               showAccordions = various
-                       }
-                       name {
-                               showAccordions = legend, various
-                       }
-                       radiogroup < .checkboxgroup
-               }
-       }
-}
diff --git a/typo3/sysext/form/Resources/Private/Configuration/TypoScript/setup.txt b/typo3/sysext/form/Resources/Private/Configuration/TypoScript/setup.txt
deleted file mode 100644 (file)
index 393f171..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-tt_content.mailform.20 >
-tt_content.mailform.20 = FORM
-tt_content.mailform.20 {
-       stdWrap.wrap = <div class="csc-mailform"> | </div>
-       stdWrap {
-               editIcons = tt_content: bodytext
-               editIcons.iconTitle.data = LLL:EXT:css_styled_content/pi1/locallang.xml:eIcon.form
-
-               prefixComment = 2 | Mail form inserted:
-       }
-}
-
-#tt_content.login.20 >
-#tt_content.login.20 = FORM
-#tt_content.login.20 {
-#      prefix = login
-#      method = post
-#      10 = FIELDSET
-#      10 {
-#              legend = TEXT
-#              legend {
-#                      data = LLL:EXT:css_styled_content/pi1/locallang.xml:login.username
-#              }
-#              10 = TEXTLINE
-#              10 {
-#                      name = user
-#                      id = mailformuser
-#                      size = 20
-#                      label = TEXT
-#                      label {
-#                              data = LLL:EXT:css_styled_content/pi1/locallang.xml:login.username
-#                      }
-#              }
-#              20 = PASSWORD
-#              20 {
-#                      name = pass
-#                      id = mailformpass
-#                      size = 20
-#                      label = TEXT
-#                      label {
-#                              data = LLL:EXT:css_styled_content/pi1/locallang.xml:login.password
-#                      }
-#              }
-#      }
-#      30 = HIDDEN
-#      30 {
-#              name = logintype
-#              id = mailformlogintype
-#      }
-#      20 = SUBMIT
-#      20 {
-#              name = submit
-#              id = mailformsubmit
-#              value = login
-#      }
-#}
\ No newline at end of file
index ac31091..ab64278 100644 (file)
@@ -4,7 +4,7 @@ if (!defined('TYPO3_MODE')) {
 }
 
        // Add Default TS to Include static (from extensions)
-t3lib_extMgm::addStaticFile($_EXTKEY, 'Resources/Private/Configuration/TypoScript/', 'Default TS');
+t3lib_extMgm::addStaticFile($_EXTKEY, 'Configuration/TypoScript/', 'Default TS');
 
 $TCA['tt_content']['columns']['bodytext']['config']['wizards']['forms'] = array(
        'notNewRecords' => 1,