diff --git a/home.py b/home.py index 2e815ca9aa37695a39ce897b6ee012ebabbdc827..f801c05536527ad95bf37e5f10c8ee4e6536c8bc 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 dd8ebdbe5f8b5326bd2deddcd24ab538aff756a7..57d0780679e4e201744322ca5c30cfcff01dfc63 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 a04d325523c3e03096a11416864d4ef5a29b06d7..b5d45a03bd84570a4d4621212c8c6a04eb54e66b 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 1ca308b03f94147b6dfbfd789082dcd3dc0cc096..216f0263c9d38b5e1705afc23e76c345e5501037 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