[BUGFIX] Move FSC templates one level up 56/45056/2
authorMarkus Klein <markus.klein@typo3.org>
Mon, 30 Nov 2015 11:15:49 +0000 (12:15 +0100)
committerFrank Nägler <frank.naegler@typo3.org>
Mon, 30 Nov 2015 19:12:14 +0000 (20:12 +0100)
This make the configuration less misleading.

Resolves: #71781
Releases: master
Change-Id: Ic2e593520f52dabc1ccce136d05f465f6bd96ec9
Reviewed-on: https://review.typo3.org/45056
Reviewed-by: Josef Glatz <josef.glatz@typo3.org>
Tested-by: Josef Glatz <josef.glatz@typo3.org>
Reviewed-by: Frank Nägler <frank.naegler@typo3.org>
Tested-by: Frank Nägler <frank.naegler@typo3.org>
25 files changed:
typo3/sysext/fluid_styled_content/Configuration/TypoScript/Static/Setup/lib.fluidContent.ts
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Bullets.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Default.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Div.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Header.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/HeaderOnly.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Html.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/List.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Menu.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Shortcut.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Table.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Textmedia.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Uploads.html [deleted file]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Default.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Header.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/HeaderOnly.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Menu.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html [new file with mode: 0644]
typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html [new file with mode: 0644]

index fd83ac3..6fceae1 100644 (file)
@@ -4,7 +4,7 @@ lib.fluidContent = FLUIDTEMPLATE
 lib.fluidContent {
        templateName = Default
        templateRootPaths {
-               0 = EXT:fluid_styled_content/Resources/Private/Templates/Content/
+               0 = EXT:fluid_styled_content/Resources/Private/Templates/
                10 = {$styles.templates.templateRootPath}
        }
        partialRootPaths {
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Bullets.html
new file mode 100644 (file)
index 0000000..1d08262
--- /dev/null
@@ -0,0 +1,40 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="HeaderContentFooter" />
+
+<f:section name="content">
+       <f:if condition="{bullets}">
+               <f:switch expression="{data.bullets_type}">
+                       <f:case value="0">
+                               <ul class="ce-bullets">
+                                       <f:for each="{bullets}" as="bullet">
+                                               <li>{bullet}</li>
+                                       </f:for>
+                               </ul>
+                       </f:case>
+                       <f:case value="1">
+                               <ol class="ce-bullets">
+                                       <f:for each="{bullets}" as="bullet">
+                                               <li>{bullet}</li>
+                                       </f:for>
+                               </ol>
+                       </f:case>
+                       <f:case value="2">
+                               <dl class="ce-bullets">
+                                       <f:for each="{bullets}" as="definitionListItem">
+                                               <f:for each="{definitionListItem}" as="termDescription" iteration="termDescriptionIterator">
+                                                       <f:if condition="{termDescriptionIterator.isFirst}">
+                                                               <f:then>
+                                                                       <dt>{termDescription}</dt>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       <dd>{termDescription}</dd>
+                                                               </f:else>
+                                                       </f:if>
+                                               </f:for>
+                                       </f:for>
+                               </dl>
+                       </f:case>
+               </f:switch>
+       </f:if>
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Bullets.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Bullets.html
deleted file mode 100644 (file)
index 1d08262..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="HeaderContentFooter" />
-
-<f:section name="content">
-       <f:if condition="{bullets}">
-               <f:switch expression="{data.bullets_type}">
-                       <f:case value="0">
-                               <ul class="ce-bullets">
-                                       <f:for each="{bullets}" as="bullet">
-                                               <li>{bullet}</li>
-                                       </f:for>
-                               </ul>
-                       </f:case>
-                       <f:case value="1">
-                               <ol class="ce-bullets">
-                                       <f:for each="{bullets}" as="bullet">
-                                               <li>{bullet}</li>
-                                       </f:for>
-                               </ol>
-                       </f:case>
-                       <f:case value="2">
-                               <dl class="ce-bullets">
-                                       <f:for each="{bullets}" as="definitionListItem">
-                                               <f:for each="{definitionListItem}" as="termDescription" iteration="termDescriptionIterator">
-                                                       <f:if condition="{termDescriptionIterator.isFirst}">
-                                                               <f:then>
-                                                                       <dt>{termDescription}</dt>
-                                                               </f:then>
-                                                               <f:else>
-                                                                       <dd>{termDescription}</dd>
-                                                               </f:else>
-                                                       </f:if>
-                                               </f:for>
-                                       </f:for>
-                               </dl>
-                       </f:case>
-               </f:switch>
-       </f:if>
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Default.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Default.html
deleted file mode 100644 (file)
index 4657268..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<p style="background-color: yellow;">
-       <strong>ERROR:</strong> Content Element type "{data.CType}" has no rendering definition!
-</p>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Div.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Div.html
deleted file mode 100644 (file)
index 043344d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="ContentFooter" />
-
-<f:section name="content">
-       <hr class="ce-div" />
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Header.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Header.html
deleted file mode 100644 (file)
index 1820167..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="HeaderFooter" />
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/HeaderOnly.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/HeaderOnly.html
deleted file mode 100644 (file)
index b62666b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:comment> Only used for lib.stdheader purposes. </f:comment>
-<f:render partial="Header" arguments="{_all}" />
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Html.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Html.html
deleted file mode 100644 (file)
index 33c7dbd..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="ContentFooter" />
-
-<f:section name="content">
-       <f:format.raw>{data.bodytext}</f:format.raw>
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/List.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/List.html
deleted file mode 100644 (file)
index 6cd878f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="HeaderContentFooter" />
-
-<f:section name="content">
-       <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}" />
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Menu.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Menu.html
deleted file mode 100644 (file)
index 02cb426..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="HeaderContentFooter" />
-
-<f:section name="content">
-       <f:render partial="Menu/Type-{data.menu_type}" arguments="{_all}" />
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Shortcut.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Shortcut.html
deleted file mode 100644 (file)
index 51670ba..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="ContentFooter" />
-
-<f:section name="content">
-       <f:format.raw>{shortcuts}</f:format.raw>
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Table.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Table.html
deleted file mode 100644 (file)
index e72892e..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="HeaderContentFooter" />
-
-<f:section name="content">
-       <f:if condition="{table}">
-               <table class="ce-table">
-                       <f:if condition="{data.table_caption}">
-                               <caption>{data.table_caption}</caption>
-                       </f:if>
-                       <f:for each="{table}" as="row" iteration="rowIterator">
-
-                               <f:if condition="{rowIterator.isFirst}">
-                                       <f:then>
-                                               <f:if condition="{data.table_header_position} == 1">
-                                                       <f:then>
-                                                               <thead>
-                                                       </f:then>
-                                                       <f:else>
-                                                               <tbody>
-                                                       </f:else>
-                                               </f:if>
-                                       </f:then>
-                                       <f:else>
-                                               <f:if condition="{rowIterator.isLast}">
-                                                       <f:if condition="{data.table_tfoot}">
-                                                               </tbody>
-                                                               <tfoot>
-                                                       </f:if>
-                                               </f:if>
-                                       </f:else>
-                               </f:if>
-
-                               <tr>
-                                       <f:for each="{row}" as="cell" iteration="columnIterator">
-                                               <f:render partial="Table/Columns" arguments="{_all}" />
-                                       </f:for>
-                               </tr>
-
-                               <f:if condition="{rowIterator.isFirst}">
-                                       <f:then>
-                                               <f:if condition="{data.table_header_position} == 1">
-                                                       </thead>
-                                                       <tbody>
-                                               </f:if>
-                                       </f:then>
-                                       <f:else>
-                                               <f:if condition="{rowIterator.isLast}">
-                                                       <f:if condition="{data.table_tfoot}">
-                                                               <f:then>
-                                                                       </tfoot>
-                                                               </f:then>
-                                                               <f:else>
-                                                                       </tbody>
-                                                               </f:else>
-                                                       </f:if>
-                                               </f:if>
-                                       </f:else>
-                               </f:if>
-
-                       </f:for>
-               </table>
-       </f:if>
-</f:section>
-</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Textmedia.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Textmedia.html
deleted file mode 100644 (file)
index e84930b..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<div id="c{data.uid}">
-       <f:if condition="{gallery.position.noWrap} != 1">
-               <f:render partial="Header" arguments="{_all}" />
-       </f:if>
-
-       <div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
-               <f:if condition="{gallery.position.vertical} != 'below'">
-                       <f:render partial="MediaGallery" arguments="{_all}" />
-               </f:if>
-
-               <div class="ce-bodytext">
-                       <f:if condition="{gallery.position.noWrap}">
-                               <f:render partial="Header" arguments="{_all}" />
-                       </f:if>
-                       <f:format.html>{data.bodytext}</f:format.html>
-               </div>
-
-               <f:if condition="{gallery.position.vertical} == 'below'">
-                       <f:render partial="MediaGallery" arguments="{_all}" />
-               </f:if>
-       </div>
-
-       <f:render partial="Footer" arguments="{_all}" />
-</div>
-</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Uploads.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Content/Uploads.html
deleted file mode 100644 (file)
index d50ff35..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-<f:layout name="HeaderContentFooter" />
-<f:section name="content">
-       <f:if condition="{files}">
-               <ul class="ce-uploads">
-                       <f:for each="{files}" as="file" iteration="fileIterator">
-                               <li>
-                                       <f:if condition="{data.uploads_type} == 1">
-                                               <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
-                                       </f:if>
-
-                                       <f:if condition="{data.uploads_type} == 2">
-                                               <f:if condition="{f:uri.image(src: 'file:{f:if(condition: file.originalFile, then: \'file:{file.originalFile.uid}\', else: \'file:{file.uid}\')}')} != '/'">
-                                                       <f:then>
-                                                               <a href="{file.publicUrl}">
-                                                                       <f:image src="{file.uid}" treatIdAsReference="{f:if(condition: file.originalFile, then: '1', else: '0')}" width="150" alt="{file.properties.alternative}" />
-                                                               </a>
-                                                       </f:then>
-                                                       <f:else>
-                                                               <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
-                                                       </f:else>
-                                               </f:if>
-                                       </f:if>
-
-                                       <div>
-                                               <f:if condition="{file.name}">
-                                                       <a href="{file.publicUrl}">
-                                                               <span class="ce-uploads-fileName">
-                                                                       {file.name}
-                                                               </span>
-                                                       </a>
-                                               </f:if>
-
-                                               <f:if condition="{file.properties.description}">
-                                                       <f:if condition="{data.uploads_description}">
-                                                               <span class="ce-uploads-description">
-                                                                       {file.properties.description}
-                                                               </span>
-                                                       </f:if>
-                                               </f:if>
-
-                                               <f:if condition="{data.filelink_size}">
-                                                       <span class="ce-uploads-filesize">
-                                                               <f:format.bytes value="{file.properties.size}" />
-                                                       </span>
-                                               </f:if>
-                                       </div>
-                               </li>
-                       </f:for>
-               </ul>
-       </f:if>
-</f:section>
-</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Default.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Default.html
new file mode 100644 (file)
index 0000000..4657268
--- /dev/null
@@ -0,0 +1,3 @@
+<p style="background-color: yellow;">
+       <strong>ERROR:</strong> Content Element type "{data.CType}" has no rendering definition!
+</p>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Div.html
new file mode 100644 (file)
index 0000000..043344d
--- /dev/null
@@ -0,0 +1,7 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="ContentFooter" />
+
+<f:section name="content">
+       <hr class="ce-div" />
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Header.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Header.html
new file mode 100644 (file)
index 0000000..1820167
--- /dev/null
@@ -0,0 +1,3 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="HeaderFooter" />
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/HeaderOnly.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/HeaderOnly.html
new file mode 100644 (file)
index 0000000..b62666b
--- /dev/null
@@ -0,0 +1,4 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:comment> Only used for lib.stdheader purposes. </f:comment>
+<f:render partial="Header" arguments="{_all}" />
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Html.html
new file mode 100644 (file)
index 0000000..33c7dbd
--- /dev/null
@@ -0,0 +1,7 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="ContentFooter" />
+
+<f:section name="content">
+       <f:format.raw>{data.bodytext}</f:format.raw>
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/List.html
new file mode 100644 (file)
index 0000000..6cd878f
--- /dev/null
@@ -0,0 +1,7 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="HeaderContentFooter" />
+
+<f:section name="content">
+       <f:cObject typoscriptObjectPath="tt_content.list.20.{data.list_type}" data="{data}" />
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Menu.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Menu.html
new file mode 100644 (file)
index 0000000..02cb426
--- /dev/null
@@ -0,0 +1,7 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="HeaderContentFooter" />
+
+<f:section name="content">
+       <f:render partial="Menu/Type-{data.menu_type}" arguments="{_all}" />
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Shortcut.html
new file mode 100644 (file)
index 0000000..51670ba
--- /dev/null
@@ -0,0 +1,7 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="ContentFooter" />
+
+<f:section name="content">
+       <f:format.raw>{shortcuts}</f:format.raw>
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Table.html
new file mode 100644 (file)
index 0000000..e72892e
--- /dev/null
@@ -0,0 +1,64 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="HeaderContentFooter" />
+
+<f:section name="content">
+       <f:if condition="{table}">
+               <table class="ce-table">
+                       <f:if condition="{data.table_caption}">
+                               <caption>{data.table_caption}</caption>
+                       </f:if>
+                       <f:for each="{table}" as="row" iteration="rowIterator">
+
+                               <f:if condition="{rowIterator.isFirst}">
+                                       <f:then>
+                                               <f:if condition="{data.table_header_position} == 1">
+                                                       <f:then>
+                                                               <thead>
+                                                       </f:then>
+                                                       <f:else>
+                                                               <tbody>
+                                                       </f:else>
+                                               </f:if>
+                                       </f:then>
+                                       <f:else>
+                                               <f:if condition="{rowIterator.isLast}">
+                                                       <f:if condition="{data.table_tfoot}">
+                                                               </tbody>
+                                                               <tfoot>
+                                                       </f:if>
+                                               </f:if>
+                                       </f:else>
+                               </f:if>
+
+                               <tr>
+                                       <f:for each="{row}" as="cell" iteration="columnIterator">
+                                               <f:render partial="Table/Columns" arguments="{_all}" />
+                                       </f:for>
+                               </tr>
+
+                               <f:if condition="{rowIterator.isFirst}">
+                                       <f:then>
+                                               <f:if condition="{data.table_header_position} == 1">
+                                                       </thead>
+                                                       <tbody>
+                                               </f:if>
+                                       </f:then>
+                                       <f:else>
+                                               <f:if condition="{rowIterator.isLast}">
+                                                       <f:if condition="{data.table_tfoot}">
+                                                               <f:then>
+                                                                       </tfoot>
+                                                               </f:then>
+                                                               <f:else>
+                                                                       </tbody>
+                                                               </f:else>
+                                                       </f:if>
+                                               </f:if>
+                                       </f:else>
+                               </f:if>
+
+                       </f:for>
+               </table>
+       </f:if>
+</f:section>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Textmedia.html
new file mode 100644 (file)
index 0000000..e84930b
--- /dev/null
@@ -0,0 +1,26 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<div id="c{data.uid}">
+       <f:if condition="{gallery.position.noWrap} != 1">
+               <f:render partial="Header" arguments="{_all}" />
+       </f:if>
+
+       <div class="ce-textpic ce-{gallery.position.horizontal} ce-{gallery.position.vertical}{f:if(condition: gallery.position.noWrap, then: ' ce-nowrap')}">
+               <f:if condition="{gallery.position.vertical} != 'below'">
+                       <f:render partial="MediaGallery" arguments="{_all}" />
+               </f:if>
+
+               <div class="ce-bodytext">
+                       <f:if condition="{gallery.position.noWrap}">
+                               <f:render partial="Header" arguments="{_all}" />
+                       </f:if>
+                       <f:format.html>{data.bodytext}</f:format.html>
+               </div>
+
+               <f:if condition="{gallery.position.vertical} == 'below'">
+                       <f:render partial="MediaGallery" arguments="{_all}" />
+               </f:if>
+       </div>
+
+       <f:render partial="Footer" arguments="{_all}" />
+</div>
+</html>
diff --git a/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html b/typo3/sysext/fluid_styled_content/Resources/Private/Templates/Uploads.html
new file mode 100644 (file)
index 0000000..d50ff35
--- /dev/null
@@ -0,0 +1,53 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:layout name="HeaderContentFooter" />
+<f:section name="content">
+       <f:if condition="{files}">
+               <ul class="ce-uploads">
+                       <f:for each="{files}" as="file" iteration="fileIterator">
+                               <li>
+                                       <f:if condition="{data.uploads_type} == 1">
+                                               <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
+                                       </f:if>
+
+                                       <f:if condition="{data.uploads_type} == 2">
+                                               <f:if condition="{f:uri.image(src: 'file:{f:if(condition: file.originalFile, then: \'file:{file.originalFile.uid}\', else: \'file:{file.uid}\')}')} != '/'">
+                                                       <f:then>
+                                                               <a href="{file.publicUrl}">
+                                                                       <f:image src="{file.uid}" treatIdAsReference="{f:if(condition: file.originalFile, then: '1', else: '0')}" width="150" alt="{file.properties.alternative}" />
+                                                               </a>
+                                                       </f:then>
+                                                       <f:else>
+                                                               <img src="{f:uri.resource(path: 'Icons/FileIcons/{file.extension}.gif', extensionName: 'frontend')}" alt="">
+                                                       </f:else>
+                                               </f:if>
+                                       </f:if>
+
+                                       <div>
+                                               <f:if condition="{file.name}">
+                                                       <a href="{file.publicUrl}">
+                                                               <span class="ce-uploads-fileName">
+                                                                       {file.name}
+                                                               </span>
+                                                       </a>
+                                               </f:if>
+
+                                               <f:if condition="{file.properties.description}">
+                                                       <f:if condition="{data.uploads_description}">
+                                                               <span class="ce-uploads-description">
+                                                                       {file.properties.description}
+                                                               </span>
+                                                       </f:if>
+                                               </f:if>
+
+                                               <f:if condition="{data.filelink_size}">
+                                                       <span class="ce-uploads-filesize">
+                                                               <f:format.bytes value="{file.properties.size}" />
+                                                       </span>
+                                               </f:if>
+                                       </div>
+                               </li>
+                       </f:for>
+               </ul>
+       </f:if>
+</f:section>
+</html>