From 8d77e4400638c797184e6305cc122ad9dafdd661 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 12 Jan 2016 13:38:23 +0100
Subject: [PATCH] Redesigned ACP login

---
 .../install/files/acp/templates/login.tpl     | 124 +++++++++---------
 .../files/acp/templates/pageFooter.tpl        |   2 +-
 2 files changed, 60 insertions(+), 66 deletions(-)

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index be65192cfb..c98705fa0f 100644
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -1,72 +1,66 @@
 {include file='header' pageTitle='wcf.user.login'}
 
-<script data-relocate="true">
-	//<![CDATA[
-	$(function() {
-		if (!$('#username').val() || '{$errorField}' == 'username') {
-			$('#username').focus();
-		}
-		else {
-			$('#password').focus();
-		}
-	});
-	//]]>
-</script>
-
-<header class="boxHeadline">
-	<h1>{@$pageTitle|language}</h1>
-</header>
-
-{include file='formError'}
-
-<form method="post" action="{link controller='Login'}{/link}">
-	<div class="container containerPadding marginTop">
-		<fieldset>
-			<legend>{lang}wcf.user.login.data{/lang}</legend>
-			
-			<dl{if $errorField == 'username'} class="formError"{/if}>
-				<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
-				<dd><input type="text" id="username" name="username" value="{$username}" class="medium" />
-					{if $errorField == 'username'}
-						<small class="innerError">
-							{if $errorType == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.user.username.error.{@$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
-				</dd>
-			</dl>
-			
-			<dl{if $errorField == 'password'} class="formError"{/if}>
-				<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
-				<dd><input type="password" id="password" name="password" value="" class="medium" />
-					{if $errorField == 'password'}
-						<small class="innerError">
-							{if $errorType == 'empty'}
-								{lang}wcf.global.form.error.empty{/lang}
-							{else}
-								{lang}wcf.user.password.error.{@$errorType}{/lang}
-							{/if}
-						</small>
-					{/if}
-				</dd>
-			</dl>
-			
-			{event name='dataFields'}
-		</fieldset>
+<div id="login" style="display: none">
+	<form method="post" action="{link controller='Login'}{/link}">
+		{include file='formError'}
 		
-		{event name='fieldsets'}
+		<dl{if $errorField == 'username'} class="formError"{/if}>
+			<dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
+			<dd><input type="text" id="username" name="username" value="{$username}" class="long" />
+				{if $errorField == 'username'}
+					<small class="innerError">
+						{if $errorType == 'empty'}
+							{lang}wcf.global.form.error.empty{/lang}
+						{else}
+							{lang}wcf.user.username.error.{@$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+			</dd>
+		</dl>
 		
+		<dl{if $errorField == 'password'} class="formError"{/if}>
+			<dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
+			<dd><input type="password" id="password" name="password" value="" class="long" />
+				{if $errorField == 'password'}
+					<small class="innerError">
+						{if $errorType == 'empty'}
+							{lang}wcf.global.form.error.empty{/lang}
+						{else}
+							{lang}wcf.user.password.error.{@$errorType}{/lang}
+						{/if}
+					</small>
+				{/if}
+			</dd>
+		</dl>
+			
 		{include file='captcha'}
-	</div>
-	
-	<div class="formSubmit">
-		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-		<input type="hidden" name="url" value="{$url}" />
-		{@SECURITY_TOKEN_INPUT_TAG}
-	</div>
-</form>
+		
+		<div class="formSubmit">
+			<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+			<input type="hidden" name="url" value="{$url}" />
+			{@SECURITY_TOKEN_INPUT_TAG}
+		</div>
+	</form>
+</div>
+
+<script data-relocate="true">
+	document.addEventListener('DOMContentLoaded', function() {
+		require(['Ui/Dialog'], function (UiDialog) {
+			UiDialog.openStatic('login', null, {
+				closable: false,
+				title: '{@$pageTitle|language}',
+				onShow: function() {
+					if (elById('username').value === '' || '{$errorField}' === 'username') {
+						elById('username').focus();
+					}
+					else {
+						elById('password').focus();
+					}
+				}
+			});
+		});
+	});
+</script>
 
 {include file='footer'}
diff --git a/wcfsetup/install/files/acp/templates/pageFooter.tpl b/wcfsetup/install/files/acp/templates/pageFooter.tpl
index eb2e851a86..1ab6362e19 100644
--- a/wcfsetup/install/files/acp/templates/pageFooter.tpl
+++ b/wcfsetup/install/files/acp/templates/pageFooter.tpl
@@ -5,7 +5,7 @@
 			
 			{if ENABLE_BENCHMARK}{include file='benchmark'}{/if}
 			
-			<address class="copyright"><a href="http://www.woltlab.com">Copyright &copy; 2001-2015 WoltLab&reg; GmbH</a>{event name='copyright'}</address>
+			<address class="copyright"><a href="http://www.woltlab.com">Copyright &copy; 2001-2016 WoltLab&reg; GmbH</a>{event name='copyright'}</address>
 		</div>
 	</div>
 </footer>
-- 
2.20.1