From 6ec5761dd276fc6ed9ae47024ddb95c56c9d0513 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sun, 6 Oct 2013 12:01:08 +0200 Subject: new footer --- pavement.py | 3 ++ pyload/api/UserApi.py | 2 +- pyload/web/app/index.html | 47 ++++++++++++++++++++++++-------- pyload/web/app/styles/default/main.less | 3 +- pyload/web/app/styles/default/style.less | 13 +-------- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/pavement.py b/pavement.py index 01c16fc6f..5bab2bfc8 100644 --- a/pavement.py +++ b/pavement.py @@ -132,6 +132,9 @@ def webapp(): if ret: exit(ret) ret = call(["bower", "install", "--no-color"]) + if ret: + exit(ret) + ret = call(["bower", "update", "--no-color"]) if ret: exit(ret) ret = call(["grunt", "--no-color"]) diff --git a/pyload/api/UserApi.py b/pyload/api/UserApi.py index 250b9080c..d6fbb2646 100644 --- a/pyload/api/UserApi.py +++ b/pyload/api/UserApi.py @@ -5,7 +5,6 @@ from pyload.Api import Api, RequirePerm, Permission from ApiComponent import ApiComponent - class UserApi(ApiComponent): """ Api methods to retrieve user profile and manage users. """ @@ -23,6 +22,7 @@ class UserApi(ApiComponent): def addUser(self, username, password): """ Adds an user to the db. + :param username: desired username :param password: password for authentication """ diff --git a/pyload/web/app/index.html b/pyload/web/app/index.html index bf75d40ed..98e1bf233 100644 --- a/pyload/web/app/index.html +++ b/pyload/web/app/index.html @@ -80,29 +80,52 @@ The pyLoad Team
-
-

Powered by

+
+

+ + Community   + +


- Bootstrap
+ Homepage · + Board · + Chat
-
-

pyLoad

+
+

+ + Follow us   + +


- dsfdsf
+ Twitter · + Youtube
-
-

Community

+ -
-

Development

+
+

+ + Donate    + +


- asd
+ PayPal · + Bitcoin · + Flattr
+
diff --git a/pyload/web/app/styles/default/main.less b/pyload/web/app/styles/default/main.less index c978a3b90..6153b576e 100644 --- a/pyload/web/app/styles/default/main.less +++ b/pyload/web/app/styles/default/main.less @@ -19,5 +19,4 @@ @DefaultFont: 'Abel', sans-serif; // Changed dimensions -@header-height: 70px; -@footer-height: 66px; \ No newline at end of file +@header-height: 70px;; \ No newline at end of file diff --git a/pyload/web/app/styles/default/style.less b/pyload/web/app/styles/default/style.less index da0e68991..ad60e5b59 100644 --- a/pyload/web/app/styles/default/style.less +++ b/pyload/web/app/styles/default/style.less @@ -284,15 +284,4 @@ header { // background-color: @greyDark; border-radius: 15px; -moz-border-radius: 15px; -webkit-border-radius: 15px; -} - -/* - Footer -*/ -footer .copyright { - background-size: 40px 40px; - background-position: 12px center; - height: 40px; - padding-left: 40px; - padding-top: 10px; -} +} \ No newline at end of file -- cgit v1.2.3