diff options
| -rw-r--r-- | pavement.py | 3 | ||||
| -rw-r--r-- | pyload/api/UserApi.py | 2 | ||||
| -rw-r--r-- | pyload/web/app/index.html | 47 | ||||
| -rw-r--r-- | pyload/web/app/styles/default/main.less | 3 | ||||
| -rw-r--r-- | 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 @@ -134,6 +134,9 @@ def webapp(): 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"]) if ret: exit(ret) 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 @@ <a href="http://pyload.org/" target="_blank">The pyLoad Team</a><br> </div> </div> - <div class="span2"> - <h2 class="block-title">Powered by</h2> + <div class="span2 block"> + <h2 class="block-title"> + <a href="http://pyload.org" target="_blank"> + Community <i class="icon-comment"></i> + </a> + </h2> <hr> - Bootstrap <br> + <a href="http://pyload.org" target="_blank">Homepage</a> · + <a href="http://board.pyload.org" target="_blank">Board</a> · + <a href="http://pyload.org/chat" target="_blank">Chat</a> </div> - <div class="span2"> - <h2 class="block-title">pyLoad</h2> + <div class="span2 block"> + <h2 class="block-title"> + <a href="https://twitter.com/pyload" target="_blank"> + Follow us <i class="icon-twitter"></i> + </a> + </h2> <hr> - dsfdsf <br> + <a href="https://twitter.com/pyload" target="_blank">Twitter</a> · + <a href="http://www.youtube.com/user/pyloadTeam" target="_blank">Youtube</a> </div> - <div class="span2"> - <h2 class="block-title">Community</h2> + <div class="span2 block"> + <h2 class="block-title"> + <a href="https://github.com/pyload" target="_blank"> + Development <i class="icon-github"></i> + </a> + </h2> <hr> - asd <br> + <a href="https://github.com/pyload" target="_blank">Github</a> · + <a href="http://docs.pyload.org" target="_blank">Documentation</a> </div> - <div class="span2"> - <h2 class="block-title">Development</h2> + <div class="span2 block"> + <h2 class="block-title"> + <a href="http://pyload.org/donate" target="_blank"> + Donate <i class="icon-bitcoin"> </i> + </a> + </h2> <hr> - asd <br> + <a href="http://pyload.org/donate" target="_blank">PayPal</a> · + <a href="http://blockchain.info/address/1JvcfSKuzk3VENJm9XtqGp2DCTesgokkG2" target="_blank">Bitcoin</a> · + <a href="https://flattr.com/profile/pyload" target="_blank">Flattr</a> </div> + </div> </div> </footer> 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 |