Merge branch 'release/2019.09-08'

composer.lock

@@ -4981,16 +4981,16 @@
         },
         {
             "name": "typo3fluid/fluid",
-            "version": "2.6.3",
+            "version": "2.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/Fluid.git",
-                "reference": "7e80658487eed78a7b67ac79e534ef76400a7d87"
+                "reference": "75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/7e80658487eed78a7b67ac79e534ef76400a7d87",
-                "reference": "7e80658487eed78a7b67ac79e534ef76400a7d87",
+                "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80",
+                "reference": "75a3a58c2ee1edf1c3b5c0d5bc815e9252afba80",
                 "shasum": ""
             },
             "require": {
@@ -5016,7 +5016,7 @@
                 "LGPL-3.0-or-later"
             ],
             "description": "The TYPO3 Fluid template rendering engine",
-            "time": "2019-09-12T11:36:15+00:00"
+            "time": "2019-09-13T09:38:15+00:00"
         },
         {
             "name": "wazum/pagetree-resizable",

public/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig

@@ -67,7 +67,7 @@ mod {
             config {
                 backend_layout {
                     colCount = 1
-                    rowCount = 2
+                    rowCount = 4
                     rows {
                         1 {
                             columns {
@@ -85,6 +85,22 @@ mod {
                                 }
                             }
                         }
+                        3 {
+                            columns {
+                                1 {
+                                    name = Content volle Breite
+                                    colPos = 4
+                                }
+                            }
+                        }
+                        4 {
+                            columns {
+                                1 {
+                                    name = Content
+                                    colPos = 2
+                                }
+                            }
+                        }
                     }
                 }
             }

public/typo3conf/ext/ep_events/Resources/Private/Layouts/Page/SubpageEpEvents.html

@@ -9,12 +9,11 @@
         <f:render partial="PageHeader" arguments="{_all}" />
         <main>
             <f:render section="Header" />
+            <!--TYPO3SEARCH_begin-->
             <div class="content content--has-sidebar">
                 <div class="content__inner">
                     <div class="content__main">
-                        <!--TYPO3SEARCH_begin-->
                         <f:render section="Content" />
-                        <!--TYPO3SEARCH_end-->
                     </div>
                     <div class="content__sidebar desktop-only">
                         <div class="box">
@@ -43,6 +42,9 @@
                     </div>
                 </div>
             </div>
+            <f:render section="FullWidthContent"/>
+            <f:render section="SubContent"/>
+            <!--TYPO3SEARCH_end-->
         </main>
         <f:render partial="PageFooter" />
         <f:render partial="MobileNav" arguments="{_all}" />

public/typo3conf/ext/ep_events/Resources/Private/Templates/Page/SubpageEpEvents.html

@@ -13,4 +13,18 @@
         <v:content.render column="0"/>
     </f:section>
 
+    <f:section name="FullWidthContent">
+        <v:content.render column="4"/>
+    </f:section>
+
+    <f:section name="SubContent">
+        <f:if condition="{v:content.get(column: 2)}">
+            <div class="content content--sub">
+                <div class="content__inner">
+                    <v:content.render column="2"/>
+                </div>
+            </div>
+        </f:if>
+    </f:section>
+
 </html>

public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_base.scss

@@ -51,6 +51,10 @@ a {
   }
 }
 
+s {
+  opacity: 0.75;
+}
+
 // Block elements
 ul {
   padding: 0 0 0 18px;

public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_tables.scss

@@ -29,7 +29,8 @@
   }
 
   & .pricetable__section td {
-    background-color: $color-grey-lighter;
+    background-color: $color-brand-primary;
+    color: white;
     line-height: 32px;
   }
 }

public/typo3conf/ext/ep_theme/Resources/Private/Templates/AjaxTable/EventPricetable.html

@@ -7,7 +7,7 @@
 
     <f:section name="Main">
         <div class="table-responsive">
-            <table class="table table-striped pricetable">
+            <table class="table table-bordered table-hover pricetable">
                 <f:for each="{categories}" as="category" key="categoryKey">
                     <f:if condition="{v:variable.get(name: 'pricetable.{categoryKey}', useRawKeys: 1) -> f:count()} > 0">
                         <tr class="pricetable__section">