Fixed ads styling

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 94c841b0deddd488f3925474ff08616d133580c8..96e051433be4b6ec83ebd6af5f5e4246e5984bd8 100644 (file)
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -21,6 +21,14 @@
                                <aside class="sidebar boxesSidebarRight">
                                        <div class="boxContainer">
                                                {content}
+                                                       {if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
+                                                               <div class="box boxBorderless">
+                                                                       <div class="boxContent">
+                                                                               {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}
+                                                                       </div>
+                                                               </div>
+                                                       {/if}
+                                                       
                                                        {event name='boxesSidebarRightTop'}
                                                                                                        
                                                        {* WCF2.1 Fallback *}
@@ -39,6 +47,14 @@
                                                        {/foreach}
                                                
                                                        {event name='boxesSidebarRightBottom'}
+                                               
+                                                       {if MODULE_WCF_AD && $__disableAds|empty && $__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
+                                                               <div class="box boxBorderless">
+                                                                       <div class="boxContent">
+                                                                               {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}
+                                                                       </div>
+                                                               </div>
+                                                       {/if}   
                                                {/content}
                                        </div>
                                </aside>

diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index 37326249348a3b4aefa59eeae0fefa850f375fc7..3a67de96a97dd1128b8498ba8b6b4ee3ce6351b1 100644 (file)
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -70,8 +70,6 @@
                                <aside class="sidebar boxesSidebarLeft">
                                        <div class="boxContainer">
                                                {content}
-                                                       {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.top')}{/if}
-                                                       
                                                        {event name='boxesSidebarLeftTop'}
                                                        
                                                        {* WCF2.1 Fallback *}
@@ -90,8 +88,6 @@
                                                        {/foreach}
                                                        
                                                        {event name='boxesSidebarLeftBottom'}
-                                                       
-                                                       {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
                                                {/content}
                                        </div>
                                </aside>

diff --git a/com.woltlab.wcf/templates/pageFooter.tpl b/com.woltlab.wcf/templates/pageFooter.tpl
index e7ab5db8bb1bc8a271ba06845fa6ddd3d6bf543b..d2c88fb06d0215a531b59305b862431577cfe607 100644 (file)
--- a/com.woltlab.wcf/templates/pageFooter.tpl
+++ b/com.woltlab.wcf/templates/pageFooter.tpl
@@ -34,12 +34,12 @@
                                        {if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
                                        
                                        {include file='pageFooterCopyright'}
+                               
+                                       {if MODULE_WCF_AD && $__disableAds|empty}
+                                               {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}
+                                       {/if}
                                {/content}
                        </div>
                </div>
        {/hascontent}
-       
-       {if MODULE_WCF_AD && $__disableAds|empty}
-               {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.bottom')}
-       {/if}
 </footer>

diff --git a/wcfsetup/install/files/style/ui/adLocation.scss b/wcfsetup/install/files/style/ui/adLocation.scss
new file mode 100644 (file)
index 0000000..90e22aa
--- /dev/null
+++ b/wcfsetup/install/files/style/ui/adLocation.scss
@@ -0,0 +1,35 @@
+.wcfAdLocation {
+       overflow: hidden;
+}
+
+.wcfAdLocationLogo {
+       @include screen-lg {
+               float: right;
+               margin-left: 30px;
+       }
+       
+       @include screen-md-down {
+               display: none;
+       }
+}
+
+.wcfAdLocationHeaderContent {
+       margin-bottom: 20px;
+}
+
+.wcfAdLocationFooterContent {
+       margin-top: 20px;
+}
+
+.wcfAdLocationHeaderContent,
+.wcfAdLocationFooterContent,
+.wcfAdLocationFooterBottom,
+.wcfAdLocationSidebarTop,
+.wcfAdLocationSidebarBottom {
+       text-align: center;
+       
+       > div {
+               display: inline-block;
+               text-align: left;
+       }
+}