Merge branch 'dev'

bin/css/style.css

@@ -408,6 +408,13 @@ ul.basic-company-preview-ul > span {
 /** page design
  * ========================================================== */
 
+.nosidebar-small-wrapper,
+.narrow-content {
+    max-width: 750px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 ul,
 ol {
     margin: 0 0 2em;

bricks.xml

@@ -139,6 +139,34 @@
                     </area>
                 </layout>
 
+                <layout layout="layout/noSidebarSmall">
+                    <area name="prefixContentBricks" inheritance="1" priority="2">
+                        <title>
+                            <locale group="quiqqer/template-presentation"
+                                    var="area.sidebar.prefix.content.title"
+                            />
+                        </title>
+                        <description>
+                            <locale group="quiqqer/template-presentation"
+                                    var="area.sidebar.prefix.content.description"
+                            />
+                        </description>
+                    </area>
+
+                    <area name="suffixContentBricks" inheritance="1" priority="4">
+                        <title>
+                            <locale group="quiqqer/template-presentation"
+                                    var="area.sidebar.suffix.content.title"
+                            />
+                        </title>
+                        <description>
+                            <locale group="quiqqer/template-presentation"
+                                    var="area.sidebar.suffix.content.description"
+                            />
+                        </description>
+                    </area>
+                </layout>
+
                 <layout layout="layout/leftSidebar">
                     <area name="leftSidebar" inheritance="1" priority="3">
                         <title>

layout/noSidebarSmall.html

+
+{assign var=prefixContentBricks value=$BricksManager->getBricksByArea('prefixContentBricks', $Site)}
+{assign var=suffixContentBricks value=$BricksManager->getBricksByArea('suffixContentBricks', $Site)}
+
+{if !empty( $prefixContentBricks )}
+{foreach from=$prefixContentBricks item=Brick}
+<section class="tpl-presentation-row">
+    {if $Brick->getAttribute('frontendTitle')}
+    <h1 class="brick-title">{$Brick->getAttribute('frontendTitle')}</h1>
+    {/if}
+    {assign var=showTitle value=$Brick->setSetting('showTitle', false)}
+    {$Brick->create()}
+</section>
+{/foreach}
+{/if}
+
+
+<div class="nosidebar-small-wrapper">
+    {if !$showHeader}
+    {if $showPageTitle}
+    <header class="content-header">
+        <h1 itemprop="name">
+            {$Site->getAttribute('title')}
+        </h1>
+    </header>
+    {/if}
+
+    {if $showPageShort}
+    <div class="content-short" itemprop="description">
+        {$Site->getAttribute('short')|nl2br}
+    </div>
+    {/if}
+    {/if}
+
+
+    {$Template->getBody()}
+</div>
+
+
+{if !empty( $suffixContentBricks )}
+{foreach from=$suffixContentBricks item=Brick}
+<section class="tpl-presentation-row">
+    {if $Brick->getAttribute('frontendTitle')}
+    <h1 class="brick-title">{$Brick->getAttribute('frontendTitle')}</h1>
+    {/if}
+    {assign var=showTitle value=$Brick->setSetting('showTitle', false)}
+    {$Brick->create()}
+</section>
+{/foreach}
+{/if}
\ No newline at end of file

locale.xml

@@ -222,6 +222,10 @@
             <de><![CDATA[Keine Sidebar]]></de>
             <en><![CDATA[No sidebar]]></en>
         </locale>
+        <locale name="admin.layout.noSidebarSmall">
+            <de><![CDATA[Keine Sidebar - schmaller Inhalt]]></de>
+            <en><![CDATA[No sidebar - narrow content]]></en>
+        </locale>
         <locale name="admin.layout.leftSidebar.description">
             <de><![CDATA[Standardmäßig Sidebar auf der linken Seite]]></de>
             <en><![CDATA[]]></en>

site.xml

@@ -102,6 +102,16 @@
             </description>
         </layout>
 
+        <layout type="layout/noSidebarSmall"
+                image="bin/layouts/noSidebar.png">
+            <title>
+                <locale group="quiqqer/template-presentation" var="admin.layout.noSidebarSmall"/>
+            </title>
+            <description>
+                <locale group="quiqqer/template-presentation" var="admin.layout.noSidebarSmall.desc"/>
+            </description>
+        </layout>
+
         <layout type="layout/leftSidebar"
                 image="bin/layouts/leftSidebar.png">
             <title>