diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-06-13 20:22:23 +0200 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-06-13 20:22:23 +0200 |
| commit | b790dbd2aeeb9a72766c6fac71bfb147878cba81 (patch) | |
| tree | 0ef2ba842542744b4fd279a930002a9e0d302304 /pyload/web/app | |
| parent | converted templates to default mustache syntax (diff) | |
| download | pyload-b790dbd2aeeb9a72766c6fac71bfb147878cba81.tar.xz | |
fixed font and remote addresses
Diffstat (limited to 'pyload/web/app')
| -rw-r--r-- | pyload/web/app/index.html | 6 | ||||
| -rw-r--r-- | pyload/web/app/scripts/app.js | 1 | ||||
| -rw-r--r-- | pyload/web/app/styles/font.css | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/pyload/web/app/index.html b/pyload/web/app/index.html index 5f2dd4265..42dd005e4 100644 --- a/pyload/web/app/index.html +++ b/pyload/web/app/index.html @@ -8,6 +8,7 @@ <meta name="description" content="pyLoad WebUI"> <meta name="viewport" content="width=device-width"> + <!-- TODO: basepath and templates --> <link href="styles/font.css" rel="stylesheet" type="text/css"/> <link href="styles/default/main.css" rel="stylesheet" type="text/css"> @@ -27,8 +28,9 @@ seconds: ['second', 'seconds'] }; // TODO carefully when translating - window.hostProtocol = 'http://'; - window.hostAddress = 'localhost'; + // TODO: use configured values + window.hostProtocol = window.location.protocol + '//'; + window.hostAddress = window.location.hostname; window.hostPort = '8001'; window.pathPrefix = "/"; diff --git a/pyload/web/app/scripts/app.js b/pyload/web/app/scripts/app.js index ed96cc55e..af5c50b14 100644 --- a/pyload/web/app/scripts/app.js +++ b/pyload/web/app/scripts/app.js @@ -78,7 +78,6 @@ define([ }; App.openWebSocket = function(path) { - // TODO return new WebSocket(window.wsAddress.replace('%s', window.hostAddress) + path); }; diff --git a/pyload/web/app/styles/font.css b/pyload/web/app/styles/font.css index fa2de514b..95d1614a5 100644 --- a/pyload/web/app/styles/font.css +++ b/pyload/web/app/styles/font.css @@ -40,6 +40,7 @@ font-family: 'Abel'; font-style: normal; font-weight: 400; - src: local('Abel'), local('Abel-Regular'), url(../fonts/Abel-Regular.woff) format('woff'); - src: url(../fonts/Abel-Regular.ttf) format('truetype'); + src: local('Abel'), local('Abel-Regular'); + src: url(../fonts/Abel-Regular.woff) format('woff'); + url(../fonts/Abel-Regular.ttf) format('truetype'); } |