diff --git a/couchpotato/__init__.py b/couchpotato/__init__.py index 930e465d..04756fa4 100644 --- a/couchpotato/__init__.py +++ b/couchpotato/__init__.py @@ -23,7 +23,6 @@ class BaseHandler(RequestHandler): password = Env.setting('password') if username or password: - print self.get_secure_cookie('user') return self.get_secure_cookie('user') else: # Login when no username or password are set return True @@ -97,9 +96,9 @@ class LoginHandler(BaseHandler): def get(self, *args, **kwargs): if self.get_current_user(): - self.redirect('/') + self.redirect(Env.get('web_base')) else: - self.write(template_loader.load('login.html').generate()) + self.write(template_loader.load('login.html').generate(sep = os.sep, fireEvent = fireEvent, Env = Env)) def post(self, *args, **kwargs): @@ -113,15 +112,15 @@ class LoginHandler(BaseHandler): if api: remember_me = tryInt(self.get_argument('remember_me', default = 0)) - self.set_secure_cookie('user', api, expires_days = 30 if remember_me else 0) + self.set_secure_cookie('user', api, expires_days = 30 if remember_me > 0 else None) - self.redirect('/') + self.redirect(Env.get('web_base')) class LogoutHandler(BaseHandler): def get(self, *args, **kwargs): self.clear_cookie('user') - self.redirect('/login') + self.redirect('%slogin/' % Env.get('web_base')) def page_not_found(rh): diff --git a/couchpotato/static/fonts/Lobster-webfont.eot b/couchpotato/static/fonts/Lobster-webfont.eot new file mode 100755 index 00000000..56f66aae Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.eot differ diff --git a/couchpotato/static/fonts/Lobster-webfont.svg b/couchpotato/static/fonts/Lobster-webfont.svg new file mode 100755 index 00000000..e4455833 --- /dev/null +++ b/couchpotato/static/fonts/Lobster-webfont.svg @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/couchpotato/static/fonts/Lobster-webfont.ttf b/couchpotato/static/fonts/Lobster-webfont.ttf new file mode 100755 index 00000000..4c46e93f Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.ttf differ diff --git a/couchpotato/static/fonts/Lobster-webfont.woff b/couchpotato/static/fonts/Lobster-webfont.woff new file mode 100755 index 00000000..af59caad Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.woff differ diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main.css index e79dbea8..3b810564 100644 --- a/couchpotato/static/style/main.css +++ b/couchpotato/static/style/main.css @@ -127,6 +127,7 @@ body > .spinner, .mask{ line-height: 1; border-radius: 2px; cursor: pointer; + border: none; } .button.red { background-color: #ff0000; } .button.green { background-color: #2aa300; } @@ -199,7 +200,7 @@ body > .spinner, .mask{ top: -3px; } .icon2.menu:before { - content: "\e076 \e076 \e076"; + content: "\e076 \e076 \e076"; line-height: 6px; transform: scaleX(2); width: 20px; @@ -257,13 +258,14 @@ body > .spinner, .mask{ .header .logo { display: inline-block; - font-size: 1.75em; - padding: 15px 30px 0 15px; + font-size: 3em; + padding: 4px 30px 0 15px; height: 100%; border-right: 1px solid rgba(255,255,255,.07); color: #FFF; font-weight: normal; vertical-align: top; + font-family: Lobster; } @media all and (max-width: 480px) { @@ -274,6 +276,7 @@ body > .spinner, .mask{ .header .logo { padding-top: 7px; border: 0; + font-size: 1.7em; } } @@ -788,6 +791,73 @@ body > .spinner, .mask{ right: 0; color: #FFF; } + +/*** Login ***/ +.page.login { + display: block; +} + + .login h1 { + padding: 0 0 10px; + font-size: 60px; + font-family: Lobster; + font-weight: normal; + } + + .login form { + padding: 0; + height: 300px; + width: 400px; + position: fixed; + left: 50%; + top: 50%; + margin: -200px 0 0 -200px; + } + @media all and (max-width: 480px) { + + .login form { + padding: 0; + height: 300px; + width: 90%; + position: absolute; + left: 5%; + top: 10px; + margin: 0; + } + + } + + .page.login .ctrlHolder { + padding: 0; + margin: 0 0 20px; + } + .page.login .ctrlHolder:hover { + background: none; + } + + .page.login input[type=text], + .page.login input[type=password] { + width: 100% !important; + font-size: 25px; + padding: 14px !important; + } + + .page.login .remember_me { + font-size: 15px; + float: left; + width: 150px; + padding: 20px 0; + } + + .page.login .remember_me .check { + margin: 5px 5px 0 0; + } + + .page.login .button { + font-size: 25px; + padding: 20px; + float: right; + } /* Fonts */ @font-face { @@ -846,5 +916,15 @@ body > .spinner, .mask{ url('../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg'); font-weight: bold; font-style: italic; +} +@font-face { + font-family: 'Lobster'; + src: url('../fonts/Lobster-webfont.eot'); + src: url('../fonts/Lobster-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/Lobster-webfont.woff') format('woff'), + url('../fonts/Lobster-webfont.ttf') format('truetype'), + url('../fonts/Lobster-webfont.svg#lobster_1.4regular') format('svg'); + font-weight: normal; + font-style: normal; } \ No newline at end of file diff --git a/couchpotato/templates/login.html b/couchpotato/templates/login.html index d06440c7..35626221 100644 --- a/couchpotato/templates/login.html +++ b/couchpotato/templates/login.html @@ -5,14 +5,34 @@ - Login + {% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'front', single = True) %} + {% end %} + + {% for url in fireEvent('clientscript.get_scripts', as_html = True, location = 'front', single = True) %} + {% end %} + + + + + + + CouchPotato - +
-
-
-
-
+

CouchPotato

+
+
+
+ + +
\ No newline at end of file