[BUGFIX] Streamline EXT:fluid_styled_content typoscript 45/43745/3
authorFrans Saris <franssaris@gmail.com>
Fri, 2 Oct 2015 14:53:59 +0000 (16:53 +0200)
committerFrans Saris <franssaris@gmail.com>
Tue, 6 Oct 2015 05:59:25 +0000 (07:59 +0200)
Change-Id: I72b04a79f0ed36a3156d329bd071b84c54bbbfa0
Resolves: #70312
Releases: master
Reviewed-on: http://review.typo3.org/43745
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Frans Saris <franssaris@gmail.com>
Tested-by: Frans Saris <franssaris@gmail.com>
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/constants.txt
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/setup.txt
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Styling/setup.txt
typo3/sysext/frontend/Classes/DataProcessing/GalleryProcessor.php

index d39d698..3b6a1f4 100644 (file)
@@ -16,19 +16,11 @@ lib.fluidContent {
                defaultHeaderType = {$styles.content.defaultHeaderType}
 
                media {
-                       gallery {
-                               columnSpacing = {$styles.content.textmedia.colSpace}
-                               maximumImageWidth = {$styles.content.textmedia.maxW}
-                               maximumImageWidthInText = {$styles.content.textmedia.maxWInText}
-                               borderWidth = {$styles.content.textmedia.borderThick}
-                               borderPadding = {$styles.content.textmedia.borderSpace}
-                       }
                        popup {
                                bodyTag = <body style="margin:0; background:#fff;">
                                wrap = <a href="javascript:close();"> | </a>
                                width = {$styles.content.textmedia.linkWrap.width}
                                height = {$styles.content.textmedia.linkWrap.height}
-                               effects = {$styles.content.textmedia.linkWrap.effects}
 
                                JSwindow = 1
                                JSwindow {
index 6f6cc71..099c161 100644 (file)
@@ -19,29 +19,28 @@ styles.content {
 
        textmedia {
                # cat=content/cTextmedia/b1; type=int+; label= Max Image/Media Width: This indicates that maximum number of pixels (width) a block of media elements inserted as content is allowed to consume
-               maxWidth = 600
+               maxW = 600
                # cat=content/cTextmedia/b2; type=int+; label= Max Image/Media Width (Text): Same as above, but this is the maximum width when text is wrapped around an block of media elements. Default is 50% of the normal Max Media Item Width
-               maxWidthInText = 300
+               maxWInText = 300
 
                # cat=content/cTextmedia/g1; type=int[0-100]; label= Advanced, Column space: Horizontal distance between media elements in a block in content elements of type "Media & Images". If you change this manually in your CSS, you need to adjust this setting accordingly
-               columnSpace = 10
+               columnSpacing = 10
                # cat=content/cTextmedia/g2; type=int[0-100]; label= Advanced, Row space: Vertical distance after each media elements row in content elements of type ""Text & Media". If you change this manually in your CSS, you need to adjust this setting accordingly
-               rowSpace = 10
+               rowSpacing = 10
                # cat=content/cTextmedia/g3; type=int[0-100]; label= Advanced, Margin to text: Horizontal distance between an imageblock and text in content elements of type "Text & Images"
                textMargin = 10
 
                # cat=content/cTextmedia/i1; type=color; label= Media element border, color: Bordercolor of media elements in content elements when "Border"-option for an element is set
                borderColor = black
                # cat=content/cTextmedia/i2; type=int[0-100]; label= Media element border, thickness: Thickness of border around media elements in content elements when "Border"-option for element is set
-               borderThick = 2
+               borderWidth = 2
                # cat=content/cTextmedia/i3; type=int+; label= Media element border, padding: Padding left and right to the media element, around the border
-               borderSpace = 0
+               borderPadding = 0
 
                # cat=content/cTextmedia/c1; type=int+; label= Click-enlarge Media Width: This specifies the width of the enlarged media element when click-enlarge is enabled
                linkWrap.width = 800m
                # cat=content/cTextmedia/c2; type=int+; label= Click-enlarge Media Height: This specifies the height of the enlarged media element when click-enlarge is enabled
                linkWrap.height = 600m
-               linkWrap.effects =
                # cat=content/cTextmedia/c3; type=boolean; label= Advanced, New window: If set, every click-enlarged media element will open in it's own popup window and not the current popup window (which may have a wrong size for the media element to fit in)
                linkWrap.newWindow = 0
                # cat=content/cTextmedia/c4; type=boolean; label= Lightbox click-enlarge rendering: Whether media elements with click-enlarge checked should be rendered lightbox-compliant
@@ -60,4 +59,4 @@ styles.content {
                # cat=content/links/l3; type=string; label= Parts to keep when building links: Comma separated list of the link parts to show when building the link-text: scheme,path,query. Example: "" (empty) => www.example.com, "sheme,path" => http://www.example.com
                keep = path
        }
-}
\ No newline at end of file
+}
index b1f2e0b..260d191 100644 (file)
@@ -178,17 +178,11 @@ tt_content {
                        }
                        20 = TYPO3\CMS\Frontend\DataProcessing\GalleryProcessor
                        20 {
-                               maxGalleryWidth = {$styles.content.imgtext.maxW}
-                               maxGalleryWidth {
-                                       override.data = register:maxImageWidth
-                               }
-                               maxGalleryWidthInText = {$styles.content.imgtext.maxWInText}
-                               maxGalleryWidthInText {
-                                       override.data = register:maxImageWidthInText
-                               }
-                               columnSpacing = {$styles.content.imgtext.colSpace}
-                               borderWidth = {$styles.content.imgtext.borderThick}
-                               borderPadding = {$styles.content.imgtext.borderSpace}
+                               maxGalleryWidth = {$styles.content.textmedia.maxW}
+                               maxGalleryWidthInText = {$styles.content.textmedia.maxWInText}
+                               columnSpacing = {$styles.content.textmedia.columnSpacing}
+                               borderWidth = {$styles.content.textmedia.borderWidth}
+                               borderPadding = {$styles.content.textmedia.borderPadding}
                        }
                }
                stdWrap {
index 8ab26fc..a53594a 100644 (file)
@@ -18,8 +18,8 @@ plugin.tx_frontend._CSS_DEFAULT_STYLE (
        .ce-gallery iframe { border-width: 0; }
        .ce-border img,
        .ce-border iframe {
-               border: {$styles.content.textmedia.borderThick}px solid {$styles.content.textmedia.borderColor};
-               padding: {$styles.content.textmedia.borderSpace}px;
+               border: {$styles.content.textmedia.borderWidth}px solid {$styles.content.textmedia.borderColor};
+               padding: {$styles.content.textmedia.borderPadding}px;
        }
 
        .ce-intext.ce-right .ce-gallery, .ce-intext.ce-left .ce-gallery, .ce-above .ce-gallery {
@@ -32,7 +32,7 @@ plugin.tx_frontend._CSS_DEFAULT_STYLE (
        .ce-column { margin-right: {$styles.content.textmedia.colSpace}px; }
        .ce-column:last-child { margin-right: 0; }
 
-       .ce-row { margin-bottom: {$styles.content.textmedia.rowSpace}px; }
+       .ce-row { margin-bottom: {$styles.content.textmedia.rowSpacing}px; }
        .ce-row:last-child { margin-bottom: 0; }
 
        .ce-above .ce-bodytext { clear: both; }
index 80d2547..83fdb24 100644 (file)
@@ -40,8 +40,8 @@ use TYPO3\CMS\Frontend\ContentObject\Exception\ContentRenderingException;
  *   borderEnabled.field = imageborder
  *   borderPadding = 0
  *   borderWidth = 0
- *   maxGalleryWidth = {$styles.content.imgtext.maxW}
- *   maxGalleryWidthInText = {$styles.content.imgtext.maxWInText}
+ *   maxGalleryWidth = {$styles.content.mediatext.maxW}
+ *   maxGalleryWidthInText = {$styles.content.mediatext.maxWInText}
  *   as = gallery
  * }
  *