From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 11 Jan 2023 13:21:56 +0000 (+0100)
Subject: Merge branch '5.5'
X-Git-Tag: 6.0.0_Alpha_1~540
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fa0bbbcae3d04760e1854ee3a9696e81d5e375cb;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.5'
---

fa0bbbcae3d04760e1854ee3a9696e81d5e375cb
diff --cc com.woltlab.wcf/templates/login.tpl
index c7f8868171,825bb8730e..6c09296512
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@@ -80,25 -80,41 +80,41 @@@
  							{content}
  								{if FACEBOOK_PUBLIC_KEY !== '' && FACEBOOK_PRIVATE_KEY !== ''}
  									<li id="facebookAuth" class="thirdPartyLogin">
- 										<a href="{link controller='FacebookAuth'}{/link}" class="button thirdPartyLoginButton facebookLoginButton">{icon size=24 name='facebook' type='brand'} <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
+ 										<a
+ 											href="{link controller='FacebookAuth'}{/link}"
+ 											class="button thirdPartyLoginButton facebookLoginButton"
+ 											rel="nofollow"
 -										><span class="icon icon24 fa-facebook-official"></span> <span>{lang}wcf.user.3rdparty.facebook.login{/lang}</span></a>
++										>{icon size=24 name='facebook' type='brand'} <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">{icon size=24 name='google' type='brand'} <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
+ 										<a
+ 											href="{link controller='GoogleAuth'}{/link}"
+ 											class="button thirdPartyLoginButton googleLoginButton"
+ 											rel="nofollow"
 -										><span class="icon icon24 fa-google"></span> <span>{lang}wcf.user.3rdparty.google.login{/lang}</span></a>
++										>{icon size=24 name='google' type='brand'} <span>{lang}wcf.user.3rdparty.google.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">{icon size=24 name='twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
+ 										<a
+ 											href="{link controller='TwitterAuth'}{/link}"
+ 											class="button thirdPartyLoginButton twitterLoginButton"
+ 											rel="nofollow"
 -										><span class="icon icon24 fa-twitter"></span> <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
++										>{icon size=24 name='twitter' type='brand'} <span>{lang}wcf.user.3rdparty.twitter.login{/lang}</span></a>
  									</li>
  								{/if}
  								
  								{if GITHUB_PUBLIC_KEY !== '' && GITHUB_PRIVATE_KEY !== ''}
  									<li id="githubAuth" class="thirdPartyLogin">
- 										<a href="{link controller='GithubAuth'}{/link}" class="button thirdPartyLoginButton githubLoginButton">{icon size=24 name='github' type='brand'} <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+ 										<a
+ 											href="{link controller='GithubAuth'}{/link}"
+ 											class="button thirdPartyLoginButton githubLoginButton"
+ 											rel="nofollow"
 -										><span class="icon icon24 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
++										>{icon size=24 name='github' type='brand'} <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
  									</li>
  								{/if}
  								
diff --cc com.woltlab.wcf/templates/pageHeaderUser.tpl
index a4294ff709,1acd277170..fc4343fe52
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@@ -211,17 -224,3 +211,22 @@@
  		</li>
  	</ul>
  </nav>
 +{if $__wcf->user->userID}
 +	<button type="button" class="pageHeaderUserMobile" aria-expanded="false" aria-label="{lang}wcf.menu.user{/lang}">
 +		<span class="pageHeaderUserMobileInactive">
 +			{@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(32, false)}
 +		</span>
 +		<span class="pageHeaderUserMobileActive">
 +			{icon size=32 name='xmark'}
 +		</span>
 +	</button>
 +{else}
- 	<a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="userPanelLoginLink jsTooltip" title="{lang}wcf.user.loginOrRegister{/lang}">
++	<a
++		href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}"
++		class="userPanelLoginLink jsTooltip"
++		title="{lang}wcf.user.loginOrRegister{/lang}"
++		rel="nofollow"
++	>
 +		{icon size=32 name='arrow-right-to-bracket'}
 +	</a>
 +{/if}
diff --cc com.woltlab.wcf/templates/permissionDenied.tpl
index 0650fa29d3,c6ed89176d..376b109a20
--- a/com.woltlab.wcf/templates/permissionDenied.tpl
+++ b/com.woltlab.wcf/templates/permissionDenied.tpl
@@@ -35,7 -35,13 +35,13 @@@
  		<h2 class="sectionTitle">{lang}wcf.user.login{/lang}</h2>
  		
  		<p>{lang}wcf.page.error.loginAvailable{/lang}</p>
- 		<p style="margin-top: 20px"><a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="button">{icon name='key'} {lang}wcf.user.loginOrRegister{/lang}</a></p>
+ 		<p style="margin-top: 20px">
+ 			<a
+ 				href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}"
+ 				class="button"
+ 				rel="nofollow"
 -			><span class="icon icon16 fa-key"></span> {lang}wcf.user.loginOrRegister{/lang}</a>
++			>{icon name='key'} {lang}wcf.user.loginOrRegister{/lang}</a>
+ 		</p>
  	</section>
  {/if}