From ac1c95718a1e7097dc68f0dcf191a5aee533315d Mon Sep 17 00:00:00 2001
From: jonasled <jonas@jonasled.de>
Date: Mon, 24 Feb 2020 20:42:42 +0100
Subject: [PATCH] move login link style in css file
---
home.py | 4 ++--
newurl.py | 4 ++--
static/style.css | 7 +++++++
userprofile.py | 2 +-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/home.py b/home.py
index 2e815ca..f801c05 100644
--- a/home.py
+++ b/home.py
@@ -1,9 +1,9 @@
from flask import render_template, abort
def home(request, builddate, version, domain_prepared, recaptchaPublicKey, showDomainSelect, cookieNotice, domain_to_index, s, loginEnabled):
try:
- loginbar = "Hello " + s.loads(request.cookies.get('username')) + ' (<a href="/user/links" style="color:white">your links</a>, <a href="/user/logout" style="color:white">logout</a>)'
+ loginbar = "Hello " + s.loads(request.cookies.get('username')) + ' (<a href="/user/links" >your links</a>, <a href="/user/logout" >logout</a>)'
except:
- loginbar = '<a href="#" onClick="showLogin()" style="color:white">login</a>'
+ loginbar = '<a href="#" onClick="showLogin()" >login</a>'
try:
return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar, cookieNotice=cookieNotice ,domain_prefilled=domain_to_index[request.headers["host"]], loginEnabled=loginEnabled) #return the default site to create a new shorten link
diff --git a/newurl.py b/newurl.py
index dd8ebdb..57d0780 100644
--- a/newurl.py
+++ b/newurl.py
@@ -6,10 +6,10 @@ from makeqr import makeQR
def newurl(request, skipCaptcha, recaptchaPrivateKey, recaptchaPublicKey, builddate, version, domain_prepared, domain_to_index, showDomainSelect, cookieNotice, s, url_scheme):
try:
userID = s.loads(request.cookies.get('userID'))
- loginbar = "Hello " + s.loads(request.cookies.get('username')) + ' (<a href="/user/links" style="color:white">your links</a>, <a href="/user/logout" style="color:white">logout</a>)'
+ loginbar = "Hello " + s.loads(request.cookies.get('username')) + ' (<a href="/user/links" >your links</a>, <a href="/user/logout" >logout</a>)'
except:
userID = "null"
- loginbar = '<a href="/user/login" style="color:white">login</a>'
+ loginbar = '<a href="/user/login" >login</a>'
if not grecaptcha_verify(request, skipCaptcha, recaptchaPrivateKey):
return render_template('home.html', builddate=builddate, version=version, domain=domain_prepared, snackbar="There was an error validating, that you are a human, please try again.", long_url_prefilled=request.form.get('url'), short_url_prefilled=request.form.get('short').lower(), domain_prefilled=domain_to_index[request.form.get('domain')], recaptchaPublicKey=recaptchaPublicKey, showDomainSelect=showDomainSelect, loginbar=loginbar, cookieNotice=cookieNotice) #return the user the prefilled form with an error message, because no url to short was provided
diff --git a/static/style.css b/static/style.css
index a04d325..b5d45a0 100644
--- a/static/style.css
+++ b/static/style.css
@@ -132,6 +132,9 @@ animation: fadein 0.5s, fadeout 0.5s 2.5s;
right: 16px;
font-size: 17px;
}
+ #loginbar a{
+ color: #fff;
+ }
table, th, td {
border: 1px solid black;
@@ -276,6 +279,10 @@ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+
background-color: #1a2332;
color: #b3b3b3;
}
+ #loginbar a{
+ color: #b3b3b3;
+ }
+
table#t01 th {
color: #b3b3b3;
}
diff --git a/userprofile.py b/userprofile.py
index 1ca308b..216f026 100644
--- a/userprofile.py
+++ b/userprofile.py
@@ -8,7 +8,7 @@ def userProfile(request, cookieNotice, s, pageNumber, url_scheme):
lenEntries = 0
try:
userID = s.loads(request.cookies.get('userID')) #Get the userid from the cookie
- loginbar = "Hello " + s.loads(request.cookies.get('username')) + ' (<a href="/user/logout" style="color:white">logout</a>)' #This is the loginbar
+ loginbar = "Hello " + s.loads(request.cookies.get('username')) + ' (<a href="/user/logout" >logout</a>)' #This is the loginbar
except:
return redirect("/user/login") #If user is not logged in redirect him to the login page
--
GitLab