Improved order of the third party login buttons

diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index 90393aae97c9fc9ab931e4d70ed69f7286307f5c..f9e3a837d33eb011a88072d79f030dd59b4aaef5 100644 (file)
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -87,18 +87,6 @@
                                        <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>
@@ -110,6 +98,18 @@
                                                                                <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google"></span> <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"><span class="icon icon16 fa-twitter"></span> <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"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+                                                                       </li>
+                                                               {/if}
                                                                
                                                                {event name='3rdpartyButtons'}
                                                        {/content}

diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index e3a5dd94c9fc56774c08986026f2b440e4e6d9f2..276f1007071320c58e981d2f90131256f88dbfef 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -201,18 +201,6 @@
                                                                                <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>
@@ -224,6 +212,18 @@
                                                                                                                        <a href="{link controller='GoogleAuth'}{/link}" class="button thirdPartyLoginButton googleLoginButton"><span class="icon icon16 fa-google"></span> <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"><span class="icon icon16 fa-twitter"></span> <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"><span class="icon icon16 fa-github"></span> <span>{lang}wcf.user.3rdparty.github.login{/lang}</span></a>
+                                                                                                               </li>
+                                                                                                       {/if}
                                                                                                        
                                                                                                        {event name='3rdpartyButtons'}
                                                                                                {/content}