From b15a4e47739eb89d738a84d871b4b1f26469148f Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Sat, 6 Jun 2020 10:46:50 +0300
Subject: [PATCH] Clean up login page

---
 src/script/main.js      |  7 +++++++
 src/style/main.styl     |  3 ++-
 views/authorization.pug | 10 +++++-----
 views/layout.pug        |  2 ++
 views/user/login.pug    | 27 ++++++++++++++++-----------
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/script/main.js b/src/script/main.js
index 4dec96a..259db50 100644
--- a/src/script/main.js
+++ b/src/script/main.js
@@ -323,4 +323,11 @@ $(document).ready(function () {
       }
     })
   })
+
+  $('a[data-toggle]').click(function (e) {
+    var bn = $(this)
+    var target = $(bn.attr('data-toggle'))
+    var speed = bn.attr('data-speed') || 'fast'
+    $(target).slideToggle(speed)
+  })
 })
diff --git a/src/style/main.styl b/src/style/main.styl
index 395f459..5980496 100644
--- a/src/style/main.styl
+++ b/src/style/main.styl
@@ -99,7 +99,8 @@ code
         img
             width: 175px
             padding: 0 12px
-
+.show-more-cnt
+    display: none
 .login-btn
     display: block
     text-decoration: none
diff --git a/views/authorization.pug b/views/authorization.pug
index c4aba3a..7d4c854 100644
--- a/views/authorization.pug
+++ b/views/authorization.pug
@@ -39,23 +39,23 @@ block body
 						if scope.indexOf('email') !== -1
 							li 
 								i.fas.fa-fw.fa-envelope
-								|See your Email address
+								|&nbsp;See your Email address
 						li 
 							i.fas.fa-fw.fa-user
-							|See your Display Name
+							|&nbsp;See your Display Name
 				.noaccess 
 					span This application cannot
 					ul.nobulletin
 						if scope.indexOf('email') === -1
 							li 
 								i.fas.fa-fw.fa-envelope
-								|See your Email address
+								|&nbsp;See your Email address
 						li 
 							i.fas.fa-fw.fa-lock
-							|See your Password
+							|&nbsp;See your Password
 						li 
 							i.fas.fa-fw.fa-cogs
-							|Change your Account Settings
+							|&nbsp;Change your Account Settings
 		.alert.alert-info
 			b Note! 
 			|You can revoke #{client.title} at any time from your 
diff --git a/views/layout.pug b/views/layout.pug
index 17ba72f..738fde6 100644
--- a/views/layout.pug
+++ b/views/layout.pug
@@ -76,6 +76,8 @@ html
 							a.nav-link(href="/news") News
 						li.nav-item
 							a.nav-link(href="https://forum.icynet.eu/") Forum
+						li.nav-item
+							a.nav-link(href="https://social.icynet.eu/") Social
 					ul.navbar-nav.my-2.my-lg-0
 						if user
 							li.nav-item
diff --git a/views/user/login.pug b/views/user/login.pug
index e1cfa05..9266e40 100644
--- a/views/user/login.pug
+++ b/views/user/login.pug
@@ -3,10 +3,11 @@ block title
 	|Icy Network - Log In
 
 block body
-	.container.mb-4.mt-4
-		h1 Log in
+	.container.mb-4.mt-4.pt-4
 		.row
-			.col-sm-8
+			.col
+			.col-6
+				h1.mt-1.mb-5.text-center Log in to Icy Network
 				if message.text
 					if message.error
 						.alert.alert-danger
@@ -23,11 +24,15 @@ block body
 						label(for="password") Password
 						input.form-control(type="password", name="password", id="password")
 					button.btn.btn-primary(type="submit") Log in
-				a(href="/register") Create an account
-				|  · 
-				a(href="/login/reset") Forgot password?
-			if auth
-				aside.col-sm-4
-					if !registrations
-						.alert.alert-warning These links can only be used to log in to existing accounts.
-					include ../includes/external.pug
+					|  or 
+					a(href="/register") Create an account
+					|  · 
+					a(href="/login/reset") Forgot password?
+					if auth
+						|  · 
+						a.show-more(href="#",data-toggle="#extlogins") More options..
+						.show-more-cnt.mt-4#extlogins
+							if !registrations
+								.alert.alert-warning These links can only be used to log in to existing accounts.
+							include ../includes/external.pug
+			.col