Overhauled user login
authorAlexander Ebert <ebert@woltlab.com>
Fri, 15 Apr 2016 21:31:27 +0000 (23:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 15 Apr 2016 21:31:33 +0000 (23:31 +0200)
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
wcfsetup/install/files/style/ui/userLogin.scss [new file with mode: 0644]
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index eab1fd5a9e2040d79394b3b3e9b63836ee9c80a4..0dcf4ea2d59c414db5f666ed4da73cfcae694b95 100644 (file)
        {include file='formError'}
 {/if}
 
-<form method="post" action="{@$loginController}" id="loginForm">
-       <div class="section">
-               <dl{if $errorField == 'username'} class="formError"{/if}>
-                       <dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
-                       <dd>
-                               <input type="text" id="username" name="username" value="{$username}" required="required" 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>
-               
-               {if !REGISTER_DISABLED}
-                       <dl>
-                               <dt>{lang}wcf.user.login.action{/lang}</dt>
-                               <dd>
-                                       <label><input type="radio" name="action" value="register" /> {lang}wcf.user.login.action.register{/lang}</label>
-                                       <label><input type="radio" name="action" value="login" checked="checked" /> {lang}wcf.user.login.action.login{/lang}</label>
-                               </dd>
-                       </dl>
-               {/if}
-               
-               <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="{$password}" 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}
-                               <small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
-                       </dd>
-               </dl>
-               
-               {if $supportsPersistentLogins}
-                       <dl>
-                               <dt></dt>
+<div id="loginForm" class="loginForm">
+       <form method="post" action="{@$loginController}">
+               <section class="section loginFormLogin">
+                       <h2 class="sectionTitle">{lang}wcf.user.login.login{/lang}</h2>
+                       
+                       <dl{if $errorField == 'username'} class="formError"{/if}>
+                               <dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
                                <dd>
-                                       <label for="useCookies"><input type="checkbox" id="useCookies" name="useCookies" value="1" {if $useCookies}checked="checked" {/if}/> {lang}wcf.user.useCookies{/lang}</label>
+                                       <input type="text" id="username" name="username" value="{$username}" required="required" 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>
-               {/if}
-               
-               {event name='fields'}
-       </div>
-       
-       {hascontent}
-               <section class="section">
-                       <h2 class="sectionTitle">{lang}wcf.user.login.3rdParty{/lang}</h2>
                        
-                       <dl>
-                               <dt></dt>
+                       <dl{if $errorField == 'password'} class="formError"{/if}>
+                               <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
                                <dd>
-                                       <ul class="buttonList smallButtons">
-                                               {content}
-                                                       {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
-                                                               <li id="githubAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
-                                                               <li id="twitterAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
-                                                               </li>
+                                       <input type="password" id="password" name="password" value="{$password}" 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}
-                                                       
-                                                       {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
-                                                               <li id="facebookAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
-                                                               <li id="googleAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {event name='3rdpartyButtons'}
-                                               {/content}
-                                       </ul>
+                                               </small>
+                                       {/if}
+                                       <small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
                                </dd>
                        </dl>
+                       
+                       {if $supportsPersistentLogins}
+                               <dl>
+                                       <dt></dt>
+                                       <dd>
+                                               <label for="useCookies"><input type="checkbox" id="useCookies" name="useCookies" value="1"{if $useCookies} checked{/if}> {lang}wcf.user.useCookies{/lang}</label>
+                                       </dd>
+                               </dl>
+                       {/if}
+                       
+                       {event name='fields'}
+                       
+                       {include file='captcha'}
+                       
+                       <div class="userLoginButtons">
+                               <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
+                               <input type="hidden" name="url" value="{$url}">
+                               {@SECURITY_TOKEN_INPUT_TAG}
+                       </div>
                </section>
-       {/hascontent}
-       
-       {event name='sections'}
-       
-       {include file='captcha'}
-       
-       <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>
+               
+               {if !REGISTER_DISABLED}
+                       <section class="section loginFormRegister">
+                               <h2 class="sectionTitle">{lang}wcf.user.login.register{/lang}</h2>
+                               
+                               <p>{lang}wcf.user.login.register.teaser{/lang}</p>
+                               
+                               <div class="userLoginButtons">
+                                       <a href="{link controller='Register'}{/link}" class="button loginFormRegisterButton">{lang}wcf.user.login.register.registerNow{/lang}</a>
+                               </div>
+                       </section>
+               {/if}
+               
+               {hascontent}
+                       <section class="section loginFormThirdPartyLogin">
+                               <h2 class="sectionTitle">{lang}wcf.user.login.3rdParty{/lang}</h2>
+                               
+                               <dl>
+                                       <dt></dt>
+                                       <dd>
+                                               <ul class="buttonList smallButtons">
+                                                       {content}
+                                                               {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
+                                                                       <li id="githubAuth" class="thirdPartyLogin">
+                                                                               <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+                                                                       </li>
+                                                               {/if}
+                                                               
+                                                               {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
+                                                                       <li id="twitterAuth" class="thirdPartyLogin">
+                                                                               <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
+                                                                       </li>
+                                                               {/if}
+                                                               
+                                                               {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
+                                                                       <li id="facebookAuth" class="thirdPartyLogin">
+                                                                               <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+                                                                       </li>
+                                                               {/if}
+                                                               
+                                                               {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
+                                                                       <li id="googleAuth" class="thirdPartyLogin">
+                                                                               <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+                                                                       </li>
+                                                               {/if}
+                                                               
+                                                               {event name='3rdpartyButtons'}
+                                                       {/content}
+                                               </ul>
+                                       </dd>
+                               </dl>
+                       </section>
+               {/hascontent}
+       </form>
+</div>
 
 {include file='footer' __disableAds=true}
 
index 57c3d80e8939c27a84335b93de53673cc5cce1de..aebad8c3605e80b68e44dcdf6b719efd52e6e70a 100644 (file)
                                <!-- login box -->
                                <li id="userLogin">
                                        <a class="loginLink" href="{link controller='Login'}{/link}">{lang}wcf.user.loginOrRegister{/lang}</a>
-                                       <div id="loginForm" style="display: none;">
-                                               {capture assign='__3rdPartyButtons'}
-                                                       {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
-                                                               <li id="githubAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='GithubAuth'}{/link}" class="thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
-                                                               <li id="twitterAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
-                                                               <li id="facebookAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
-                                                               <li id="googleAuth" class="3rdPartyAuth">
-                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
-                                                               </li>
-                                                       {/if}
-                                                       
-                                                       {event name='3rdpartyButtons'}
-                                               {/capture}
-                                               
+                                       <div id="loginForm" class="loginForm" style="display: none">
                                                <form method="post" action="{link controller='Login'}{/link}">
-                                                       <{if $__3rdPartyButtons|trim}section{else}div{/if} class="section">
-                                                               {if $__3rdPartyButtons|trim}<h2 class="sectionTitle">{lang}wcf.user.login{/lang}</h2>{/if}
+                                                       <section class="section loginFormLogin">
+                                                               <h2 class="sectionTitle">{lang}wcf.user.login.login{/lang}</h2>
                                                                
                                                                <dl>
                                                                        <dt><label for="username">{lang}wcf.user.usernameOrEmail{/lang}</label></dt>
                                                                        </dd>
                                                                </dl>
                                                                
-                                                               {if !REGISTER_DISABLED}
-                                                                       <dl>
-                                                                               <dt>{lang}wcf.user.login.action{/lang}</dt>
-                                                                               <dd>
-                                                                                       <label><input type="radio" name="action" value="register" /> {lang}wcf.user.login.action.register{/lang}</label>
-                                                                                       <label><input type="radio" name="action" value="login" checked="checked" /> {lang}wcf.user.login.action.login{/lang}</label>
-                                                                               </dd>
-                                                                       </dl>
-                                                               {/if}
-                                                               
                                                                <dl>
                                                                        <dt><label for="password">{lang}wcf.user.password{/lang}</label></dt>
                                                                        <dd>
                                                                                <input type="password" id="password" name="password" value="" class="long">
+                                                                               <small><a href="{link controller='LostPassword'}{/link}">{lang}wcf.user.lostPassword{/lang}</a></small>
                                                                        </dd>
                                                                </dl>
                                                                
                                                                {if $__wcf->getUserAuthenticationFactory()->getUserAuthentication()->supportsPersistentLogins()}
                                                                        <dl>
                                                                                <dt></dt>
-                                                                               <dd><label><input type="checkbox" id="useCookies" name="useCookies" value="1" checked="checked"> {lang}wcf.user.useCookies{/lang}</label></dd>
+                                                                               <dd>
+                                                                                       <label for="useCookies"><input type="checkbox" id="useCookies" name="useCookies" value="1" checked> {lang}wcf.user.useCookies{/lang}</label>
+                                                                               </dd>
                                                                        </dl>
                                                                {/if}
                                                                
-                                                               {event name='loginFields'}
+                                                               {event name='fields'}
                                                                
-                                                               <div class="formSubmit">
-                                                                       <input type="submit" id="loginSubmitButton" name="submitButton" value="{lang}wcf.user.button.login{/lang}" accesskey="s">
-                                                                       <a class="button" href="{link controller='LostPassword'}{/link}"><span>{lang}wcf.user.lostPassword{/lang}</span></a>
+                                                               <div class="userLoginButtons">
+                                                                       <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
                                                                        <input type="hidden" name="url" value="{$__wcf->session->requestURI}">
                                                                        {@SECURITY_TOKEN_INPUT_TAG}
                                                                </div>
-                                                       </{if $__3rdPartyButtons|trim}section{else}div{/if}>
+                                                       </section>
                                                        
-                                                       {if $__3rdPartyButtons|trim}
-                                                               <section class="section">
-                                                                       <h2 class="sectionTitle">{lang}wcf.user.login.3rdParty{/lang}</h2>
-                                                                       <ul class="buttonList smallButtons thirdPartyLogin">
-                                                                               {@$__3rdPartyButtons}   
-                                                                       </ul>
+                                                       {if !REGISTER_DISABLED}
+                                                               <section class="section loginFormRegister">
+                                                                       <h2 class="sectionTitle">{lang}wcf.user.login.register{/lang}</h2>
+                                                                       
+                                                                       <p>{lang}wcf.user.login.register.teaser{/lang}</p>
+                                                                       
+                                                                       <div class="userLoginButtons">
+                                                                               <a href="{link controller='Register'}{/link}" class="button loginFormRegisterButton">{lang}wcf.user.login.register.registerNow{/lang}</a>
+                                                                       </div>
                                                                </section>
                                                        {/if}
+                                                       
+                                                       {hascontent}
+                                                               <section class="section loginFormThirdPartyLogin">
+                                                                       <h2 class="sectionTitle">{lang}wcf.user.login.3rdParty{/lang}</h2>
+                                                                       
+                                                                       <dl>
+                                                                               <dt></dt>
+                                                                               <dd>
+                                                                                       <ul class="buttonList smallButtons">
+                                                                                               {content}
+                                                                                                       {if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
+                                                                                                               <li id="githubAuth" class="thirdPartyLogin">
+                                                                                                                       <a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+                                                                                                               </li>
+                                                                                                       {/if}
+                                                                                                       
+                                                                                                       {if TWITTER_PUBLIC_KEY !== '' && TWITTER_PRIVATE_KEY !== ''}
+                                                                                                               <li id="twitterAuth" class="thirdPartyLogin">
+                                                                                                                       <a href="{link controller='TwitterAuth'}{/link}" class="button thirdPartyLoginButton twitterLoginButton"><span class="icon icon16 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
+                                                                                                               </li>
+                                                                                                       {/if}
+                                                                                                       
+                                                                                                       {if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
+                                                                                                               <li id="facebookAuth" class="thirdPartyLogin">
+                                                                                                                       <a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton"><span class="icon icon16 fa-facebook"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+                                                                                                               </li>
+                                                                                                       {/if}
+                                                                                                       
+                                                                                                       {if GOOGLE_PUBLIC_KEY !== '' && GOOGLE_PRIVATE_KEY !== ''}
+                                                                                                               <li id="googleAuth" class="thirdPartyLogin">
+                                                                                                                       <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google-plus"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+                                                                                                               </li>
+                                                                                                       {/if}
+                                                                                                       
+                                                                                                       {event name='3rdpartyButtons'}
+                                                                                               {/content}
+                                                                                       </ul>
+                                                                               </dd>
+                                                                       </dl>
+                                                               </section>
+                                                       {/hascontent}
                                                </form>
                                        </div>
                                        
diff --git a/wcfsetup/install/files/style/ui/userLogin.scss b/wcfsetup/install/files/style/ui/userLogin.scss
new file mode 100644 (file)
index 0000000..ac73f27
--- /dev/null
@@ -0,0 +1,100 @@
+.loginForm > form {
+       .userLoginButtons {
+               margin-top: 20px;
+               text-align: center;
+       }
+       
+       .thirdPartyLogin {
+               flex: 0 0 100%;
+               
+               & + .thirdPartyLogin {
+                       margin-top: 10px;
+               }
+               
+               .thirdPartyLoginButton {
+                       display: flex;
+                       border-width: 0;
+                       color: rgba(255, 255, 255, 1);
+                       
+                       > .icon {
+                               flex: 0 0 24px;
+                       }
+                       
+                       > span:not(.icon) {
+                               flex: 1 1 auto;
+                               margin-left: 5px;
+                       }
+                       
+                       /* branding */
+                       &.googleLoginButton {
+                               background-color: rgb(221, 75, 57);
+                               
+                               &:hover {
+                                       background-color: rgb(202, 53, 35);
+                               }
+                       }
+                       
+                       &.facebookLoginButton {
+                               background-color: rgb(59, 89, 152);
+                               
+                               &:hover {
+                                       background-color: rgb(48, 72, 123);
+                               }
+                       }
+                       
+                       &.twitterLoginButton {
+                               background-color: rgb(85, 172, 238);
+                               
+                               &:hover {
+                                       background-color: rgb(48, 154, 234);
+                               }
+                       }
+                       
+                       &.githubLoginButton {
+                               background-color: rgb(68, 68, 68);
+                               
+                               &:hover {
+                                       background-color: rgb(48, 48, 48);
+                               }
+                       }
+               }
+       }
+       
+       @include large-screen-only {
+               -webkit-column-count: 2;
+               -moz-column-count: 2;
+               column-count: 2;
+               
+               -webkit-column-gap: 40px;
+               -moz-column-gap: 40px;
+               column-gap: 40px;
+               
+               > .section {
+                       margin-top: 0;
+                       
+                       -webkit-column-break-inside: avoid; /* Chrome, Safari, Opera */
+                       page-break-inside: avoid; /* Firefox */
+                       break-inside: avoid; /* IE 10+ */
+                       
+                       &.loginFormLogin {
+                               -webkit-column-break-after: always;
+                               page-break-after: always;
+                               break-after: always;
+                       }
+                       
+                       &.loginFormRegister {
+                               margin-top: 0;
+                               
+                               & + .loginFormThirdPartyLogin {
+                                       margin-top: 30px;
+                               }
+                       }
+               }
+       }
+}
+
+@include large-screen-only {
+       .contentHeader ~ .loginForm {
+               margin-top: 30px;
+       }
+}
index f103538bf41330af59628c9800da35c91a0cd1a5..88c6f77ae0a539afdcbf3964242cb7337f9b635a 100644 (file)
@@ -2675,6 +2675,10 @@ Fehler sind beispielsweise:
                <item name="wcf.user.login"><![CDATA[Anmeldung]]></item>
                <item name="wcf.user.login.data"><![CDATA[Zugangsdaten]]></item>
                <item name="wcf.user.login.error.cookieRequired"><![CDATA[Die Anmeldung erfordert den Einsatz von Cookies, bitte aktivieren Sie diese um die Anmeldung durchzuführen.]]></item>
+               <item name="wcf.user.login.login"><![CDATA[Anmeldung]]></item>
+               <item name="wcf.user.login.register"><![CDATA[Registrierung]]></item>
+               <item name="wcf.user.login.register.teaser"><![CDATA[Sie haben noch kein Benutzerkonto auf unserer Seite? <a href="{link controller='Register'}{/link}">Melden Sie sich kostenlos an</a> und nehmen Sie an unserer Community teil!]]></item>
+               <item name="wcf.user.login.register.registerNow"><![CDATA[Benutzerkonto erstellen]]></item>
                <item name="wcf.user.password.error.false"><![CDATA[Dieses Kennwort ist falsch.]]></item>
                <item name="wcf.user.language"><![CDATA[Sprache]]></item>
                <item name="wcf.user.language.description"><![CDATA[Sprache der Benutzeroberfläche]]></item>
@@ -2707,9 +2711,6 @@ Fehler sind beispielsweise:
                <item name="wcf.user.button.register"><![CDATA[Registrieren]]></item>
                <item name="wcf.user.button.registerNow"><![CDATA[Jetzt registrieren]]></item>
                <item name="wcf.user.username.error.3rdParty"><![CDATA[Das Benutzerkonto ist mit einem Drittanbieter-Konto verbunden, ein Passwort kann nicht angefordert werden.]]></item>
-               <item name="wcf.user.login.action"><![CDATA[Sind Sie bereits registriert?]]></item>
-               <item name="wcf.user.login.action.login"><![CDATA[Ja, mein Kennwort lautet:]]></item>
-               <item name="wcf.user.login.action.register"><![CDATA[Nein, ich möchte mich jetzt registrieren.]]></item>
                <item name="wcf.user.login.redirect"><![CDATA[Sie wurden erfolgreich angemeldet.]]></item>
                <item name="wcf.user.loginOrRegister"><![CDATA[Anmelden{if !REGISTER_DISABLED} oder registrieren{/if}]]></item>
                <item name="wcf.user.logout.redirect"><![CDATA[Sie wurden erfolgreich abgemeldet.]]></item>
@@ -3001,7 +3002,7 @@ Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben,
        <category name="wcf.user.3rdparty">
                <item name="wcf.user.3rdparty"><![CDATA[Drittanbieter]]></item>
                <item name="wcf.user.3rdparty.github"><![CDATA[GitHub]]></item>
-               <item name="wcf.user.3rdparty.github.login"><![CDATA[GitHub]]></item>
+               <item name="wcf.user.3rdparty.github.login"><![CDATA[Mit Ihrem GitHub-Konto anmelden]]></item>
                <item name="wcf.user.3rdparty.github.login.error.access_denied"><![CDATA[Da Sie die Berechtigungen verweigert haben, ist die Anmeldung mit GitHub nicht möglich.]]></item>
                <item name="wcf.user.3rdparty.github.register"><![CDATA[Sie erstellen einen Account über <span class="icon icon16 fa-github"></span>&nbsp;GitHub. Der Benutzername und Ihre E-Mail-Adresse wurden daher bereits ausgefüllt.]]></item>
                <item name="wcf.user.3rdparty.github.connect"><![CDATA[Mit GitHub-Konto {if $__wcf->session->getVar('__githubUsername')}(„<a href="https://github.com/{$__wcf->session->getVar('__githubUsername')}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{$__wcf->session->getVar('__githubUsername')}</a>“){/if} verknüpfen]]></item>
@@ -3010,7 +3011,7 @@ Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben,
                <item name="wcf.user.3rdparty.github.disconnect"><![CDATA[Verknüpfung mit GitHub trennen]]></item>
                <item name="wcf.user.3rdparty.github.disconnect.success"><![CDATA[Die Verknüpfung mit Ihrem GitHub-Konto wurde erfolgreich getrennt.]]></item>
                <item name="wcf.user.3rdparty.twitter"><![CDATA[Twitter]]></item>
-               <item name="wcf.user.3rdparty.twitter.login"><![CDATA[Twitter]]></item>
+               <item name="wcf.user.3rdparty.twitter.login"><![CDATA[Mit Ihrem Twitter-Konto anmelden]]></item>
                <item name="wcf.user.3rdparty.twitter.login.error.denied"><![CDATA[Da Sie die Berechtigungen verweigert haben, ist die Anmeldung mit Twitter nicht möglich.]]></item>
                <item name="wcf.user.3rdparty.twitter.register"><![CDATA[Sie erstellen einen Account über <span class="icon icon16 fa-twitter"></span>&nbsp;Twitter. Der Benutzername wurde daher bereits ausgefüllt. Geben Sie nun noch Ihre E-Mail-Adresse an und Sie können sofort loslegen!]]></item>
                <item name="wcf.user.3rdparty.twitter.connect"><![CDATA[Mit Twitter-Konto {if $__wcf->session->getVar('__twitterUsername')}(„<a href="https://twitter.com/{$__wcf->session->getVar('__twitterUsername')}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank"{/if}>{$__wcf->session->getVar('__twitterUsername')}</a>“){/if} verknüpfen]]></item>
@@ -3019,7 +3020,7 @@ Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben,
                <item name="wcf.user.3rdparty.twitter.disconnect"><![CDATA[Verknüpfung mit Twitter trennen]]></item>
                <item name="wcf.user.3rdparty.twitter.disconnect.success"><![CDATA[Die Verknüpfung mit Ihrem Twitter-Konto wurde erfolgreich getrennt.]]></item>
                <item name="wcf.user.3rdparty.facebook"><![CDATA[Facebook]]></item>
-               <item name="wcf.user.3rdparty.facebook.login"><![CDATA[Facebook]]></item>
+               <item name="wcf.user.3rdparty.facebook.login"><![CDATA[Mit Ihrem Facebook-Konto anmelden]]></item>
                <item name="wcf.user.3rdparty.facebook.login.error.access_denied"><![CDATA[Da Sie die Berechtigungen verweigert haben, ist die Anmeldung mit Facebook nicht möglich.]]></item>
                <item name="wcf.user.3rdparty.facebook.register"><![CDATA[Sie erstellen einen Account über <span class="icon icon16 fa-facebook"></span>&nbsp;Facebook. Der Benutzername und Ihre E-Mail-Adresse wurden daher bereits ausgefüllt.]]></item>
                <item name="wcf.user.3rdparty.facebook.connect"><![CDATA[Mit Facebook-Konto {if $__wcf->session->getVar('__facebookUsername')}(„{$__wcf->session->getVar('__facebookUsername')}“){/if} verknüpfen]]></item>
@@ -3028,7 +3029,7 @@ Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben,
                <item name="wcf.user.3rdparty.facebook.disconnect"><![CDATA[Verknüpfung mit Facebook trennen]]></item>
                <item name="wcf.user.3rdparty.facebook.disconnect.success"><![CDATA[Die Verknüpfung mit Ihrem Facebook-Konto wurde erfolgreich getrennt.]]></item>
                <item name="wcf.user.3rdparty.google"><![CDATA[Google]]></item>
-               <item name="wcf.user.3rdparty.google.login"><![CDATA[Google]]></item>
+               <item name="wcf.user.3rdparty.google.login"><![CDATA[Mit Ihrem Google-Konto anmelden]]></item>
                <item name="wcf.user.3rdparty.google.login.error.access_denied"><![CDATA[Da Sie die Berechtigungen verweigert haben, ist die Anmeldung mit Google nicht möglich.]]></item>
                <item name="wcf.user.3rdparty.google.register"><![CDATA[Sie erstellen einen Account über <span class="icon icon16 fa-google-plus"></span>&nbsp;Google. Der Benutzername und Ihre E-Mail-Adresse wurden daher bereits ausgefüllt.]]></item>
                <item name="wcf.user.3rdparty.google.connect"><![CDATA[Mit Google-Konto {if $__wcf->session->getVar('__googleUsername')}(„{$__wcf->session->getVar('__googleUsername')}“){/if} verknüpfen]]></item>
index 19fb4674ca017138b45e69878efd27f2c65e4121..d371e850692337053b5bfa40f6a3293f4ba19aac 100644 (file)
@@ -2706,6 +2706,10 @@ Errors are:
                <item name="wcf.user.login"><![CDATA[Login]]></item>
                <item name="wcf.user.login.data"><![CDATA[Credentials]]></item>
                <item name="wcf.user.login.error.cookieRequired"><![CDATA[The login requires the acceptance of cookies, please enable cookies to proceed.]]></item>
+               <item name="wcf.user.login.login"><![CDATA[Login]]></item>
+               <item name="wcf.user.login.register"><![CDATA[Register]]></item>
+               <item name="wcf.user.login.register.teaser"><![CDATA[Don’t have an account yet? <a href="{link controller='Register'}{/link}">Register yourself now</a> and be a part of our community!]]></item>
+               <item name="wcf.user.login.register.registerNow"><![CDATA[Register Yourself]]></item>
                <item name="wcf.user.password.error.false"><![CDATA[The entered password is wrong.]]></item>
                <item name="wcf.user.language"><![CDATA[Language]]></item>
                <item name="wcf.user.language.description"><![CDATA[User interface language]]></item>
@@ -2738,9 +2742,6 @@ Errors are:
                <item name="wcf.user.button.register"><![CDATA[Register]]></item>
                <item name="wcf.user.button.registerNow"><![CDATA[Register Now]]></item>
                <item name="wcf.user.username.error.3rdParty"><![CDATA[Account is connected with a 3rd party website, password cannot be requested.]]></item>
-               <item name="wcf.user.login.action"><![CDATA[Are you already registered?]]></item>
-               <item name="wcf.user.login.action.login"><![CDATA[Yes, my password is:]]></item>
-               <item name="wcf.user.login.action.register"><![CDATA[No, register now.]]></item>
                <item name="wcf.user.login.redirect"><![CDATA[You have been logged in.]]></item>
                <item name="wcf.user.loginOrRegister"><![CDATA[Login{if !REGISTER_DISABLED} or register{/if}]]></item>
                <item name="wcf.user.logout.redirect"><![CDATA[You have been logged off.]]></item>