Merge branch '5.5'
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 11 Jan 2023 13:21:56 +0000 (14:21 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 11 Jan 2023 13:21:56 +0000 (14:21 +0100)
1  2 
com.woltlab.wcf/templates/login.tpl
com.woltlab.wcf/templates/pageHeaderUser.tpl
com.woltlab.wcf/templates/permissionDenied.tpl

index c7f8868171d974addaa55c6ca4d624df5e9b9d73,825bb8730ed7c530dcbf9e157508da7a0d9bf93f..6c0929651261cda1a93a98836054512d1b6c4da2
                                                        {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}
                                                                
index a4294ff7097123f9dc9de70988d59615af3270d9,1acd27717088fb0d91c302eeff102d623cd71225..fc4343fe52407cf47818ff795f37de59263aa030
                </li>
        </ul>
  </nav>
-       <a href="{link controller='Login' url=$__wcf->getRequestURI()}{/link}" class="userPanelLoginLink jsTooltip" title="{lang}wcf.user.loginOrRegister{/lang}">
 +{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}"
++              rel="nofollow"
++      >
 +              {icon size=32 name='arrow-right-to-bracket'}
 +      </a>
 +{/if}
index 0650fa29d3aa7895249ce8be207dbc7497970834,c6ed89176d0260a344e663b5fb3eb29602140bab..376b109a20ffa427e50a6a343a37d9ce98dc1f1a
                <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}