From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 26 Sep 2016 16:25:12 +0000 (+0200)
Subject: Fixed ads styling
X-Git-Tag: 3.0.0_Beta_2~111^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=64cffb8014f3e8908c8ae4fbd9c94258fbf9a23f;p=GitHub%2FWoltLab%2FWCF.git

Fixed ads styling
---

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 94c841b0de..96e051433b 100644
--- 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 3732624934..3a67de96a9 100644
--- 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 e7ab5db8bb..d2c88fb06d 100644
--- 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
index 0000000000..90e22aaa23
--- /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;
+	}
+}