From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 26 Jun 2016 13:12:20 +0000 (+0200)
Subject: Overhauled cookie policy notice
X-Git-Tag: 3.0.0_Beta_1~1347
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ab008a95266a49cb95ff6cb9e6efbe33f7a198a5;p=GitHub%2FWoltLab%2FWCF.git

Overhauled cookie policy notice
---

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index 8dd45119d2..d55786fc1c 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -85,14 +85,30 @@
 				
 {event name='footer'}
 
+<div class="pageFooterStickyNotice">
+	{if MODULE_COOKIE_POLICY_PAGE && $__wcf->session->isFirstVisit() && !$__wcf->user->userID}
+		<p class="info cookiePolicyNotice">
+			{lang}wcf.page.cookiePolicy.info{/lang}
+			<span class="icon icon16 fa-times jsTooltip jsOnly pointer cookiePolicyNoticeDismiss" title="{lang}wcf.global.button.close{/lang}"></span>
+			<script data-relocate="true">
+				elBySel('.cookiePolicyNoticeDismiss').addEventListener(WCF_CLICK_EVENT, function() {
+					elRemove(elBySel('.cookiePolicyNotice'));
+				});
+			</script>
+		</p>
+	{/if}
+	
+	{event name='pageFooterStickyNotice'}
+	
+	<noscript>
+		<p class="error javascriptDisabledWarning">{lang}wcf.page.javascriptDisabled{/lang}</p>
+	</noscript>
+</div>
+
 <!-- JAVASCRIPT_RELOCATE_POSITION -->
 
 {@FOOTER_CODE}
 
-<noscript>
-	<p class="javascriptDisabledWarning">{lang}wcf.page.javascriptDisabled{/lang}</p>
-</noscript>
-
 <a id="bottom"></a>
 				
 </body>
diff --git a/com.woltlab.wcf/templates/userNotice.tpl b/com.woltlab.wcf/templates/userNotice.tpl
index 3037f95170..718c33b7b1 100644
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -6,10 +6,6 @@
 		</div>
 	{/if}
 	
-	{if MODULE_COOKIE_POLICY_PAGE && $__wcf->session->isFirstVisit() && !$__wcf->user->userID}
-		<p class="info cookiePolicyNotice">{lang}wcf.page.cookiePolicy.info{/lang}</p>
-	{/if}
-	
 	{if $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage') && $__wcf->getAvailableUpdates()}
 		<p class="info">{lang}wcf.global.availableUpdates{/lang}</p>
 	{/if}
diff --git a/wcfsetup/install/files/style/ui/alert.scss b/wcfsetup/install/files/style/ui/alert.scss
index 26d7e9163a..3047c59624 100644
--- a/wcfsetup/install/files/style/ui/alert.scss
+++ b/wcfsetup/install/files/style/ui/alert.scss
@@ -69,16 +69,23 @@
 	}
 }
 
-.javascriptDisabledWarning {
-	background-color: $wcfStatusErrorBackground;
-	border-top: 1px solid $wcfStatusErrorBorder;
+/* sticky footer notices */
+.pageFooterStickyNotice {
 	bottom: 0;
-	color: $wcfStatusErrorText;
 	left: 0;
-	padding: 10px 20px;
-	position: fixed;
 	right: 0;
+	position: fixed;
 	text-align: center;
+	
+	.error,
+	.info,
+	.success,
+	.warning {
+		border-left-width: 0;
+		border-top-width: 1px;
+		border-top-style: solid;
+		margin-top: 0;
+	}	
 }
 
 /* inline infos */