From 5bbcc30697abeeebda7fb49ec49f708fb4d541e7 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 30 Apr 2016 21:14:04 +0200
Subject: [PATCH] Moved the "No-JS"-Warning

---
 com.woltlab.wcf/templates/footer.tpl       |  4 +++
 com.woltlab.wcf/templates/userNotice.tpl   | 36 ++++++++++++----------
 wcfsetup/install/files/style/ui/alert.scss | 12 ++++++++
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index dbbdd4a33d..8dd45119d2 100644
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -89,6 +89,10 @@
 
 {@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 645cbd364a..47745eefc3 100644
--- a/com.woltlab.wcf/templates/userNotice.tpl
+++ b/com.woltlab.wcf/templates/userNotice.tpl
@@ -1,4 +1,4 @@
-<div class="userNotice">
+{capture assign='__userNotice'}
 	{if OFFLINE && $__wcf->session->getPermission('admin.general.canViewPageDuringOfflineMode')}
 		<div class="warning">
 			<p><strong>{lang}wcf.page.offline{/lang}</strong></p>
@@ -14,26 +14,22 @@
 		<p class="info">{lang}wcf.global.availableUpdates{/lang}</p>
 	{/if}
 	
-	<noscript>
-		<p class="warning">{lang}wcf.page.javascriptDisabled{/lang}</p>
-	</noscript>
-	
 	{if $__wcf->user->activationCode && REGISTER_ACTIVATION_METHOD == 1 && $templateName != 'registerActivation'}
 		<p class="warning">{lang}wcf.user.register.needActivation{/lang}</p>
 	{/if}
 	
 	{hascontent}
-		{content}
-			{foreach from=$__wcf->getNoticeHandler()->getVisibleNotices() item='notice'}
-				<p class="{$notice->cssClassName} notice{if $notice->isDismissible} noticeDismissible active{/if}">
-					{if $notice->isDismissible}
-						<span class="icon icon16 fa-times pointer jsDismissNoticeButton jsTooltip" data-object-id="{$notice->noticeID}" title="{lang}wcf.notice.button.dismiss{/lang}"></span>
-					{/if}
-					
-					{@$notice}
-				</p>
-			{/foreach}
-		{/content}
+	{content}
+	{foreach from=$__wcf->getNoticeHandler()->getVisibleNotices() item='notice'}
+		<p class="{$notice->cssClassName} notice{if $notice->isDismissible} noticeDismissible active{/if}">
+			{if $notice->isDismissible}
+				<span class="icon icon16 fa-times pointer jsDismissNoticeButton jsTooltip" data-object-id="{$notice->noticeID}" title="{lang}wcf.notice.button.dismiss{/lang}"></span>
+			{/if}
+			
+			{@$notice}
+		</p>
+	{/foreach}
+	{/content}
 		
 		<script data-relocate="true">
 			require(['WoltLab/WCF/Controller/Notice/Dismiss'], function(ControllerNoticeDismiss) {
@@ -43,4 +39,10 @@
 	{/hascontent}
 	
 	{event name='userNotice'}
-</div>
+{/capture}
+
+{if $__userNotice|trim}
+	<div class="userNotice">
+		{@$__userNotice}
+	</div>
+{/if}
diff --git a/wcfsetup/install/files/style/ui/alert.scss b/wcfsetup/install/files/style/ui/alert.scss
index 7557977f0c..26d7e9163a 100644
--- a/wcfsetup/install/files/style/ui/alert.scss
+++ b/wcfsetup/install/files/style/ui/alert.scss
@@ -69,6 +69,18 @@
 	}
 }
 
+.javascriptDisabledWarning {
+	background-color: $wcfStatusErrorBackground;
+	border-top: 1px solid $wcfStatusErrorBorder;
+	bottom: 0;
+	color: $wcfStatusErrorText;
+	left: 0;
+	padding: 10px 20px;
+	position: fixed;
+	right: 0;
+	text-align: center;
+}
+
 /* inline infos */
 /* TODO: use other colors */
 .innerInfo {
-- 
2.20.1