diff options
-rw-r--r-- | module/utils/fs.py | 1 | ||||
-rw-r--r-- | module/web/api_app.py | 2 | ||||
-rw-r--r-- | module/web/static/css/mobile/images/ajax-loader.gif (renamed from module/web/static/css/default_mobile/images/ajax-loader.gif) | bin | 7825 -> 7825 bytes | |||
-rw-r--r-- | module/web/static/css/mobile/images/ajax-loader.png (renamed from module/web/static/css/default_mobile/images/ajax-loader.png) | bin | 340 -> 340 bytes | |||
-rw-r--r-- | module/web/static/css/mobile/images/icons-18-black.png (renamed from module/web/static/css/default_mobile/images/icons-18-black.png) | bin | 1767 -> 1767 bytes | |||
-rw-r--r-- | module/web/static/css/mobile/images/icons-18-white.png (renamed from module/web/static/css/default_mobile/images/icons-18-white.png) | bin | 1806 -> 1806 bytes | |||
-rw-r--r-- | module/web/static/css/mobile/images/icons-36-black.png (renamed from module/web/static/css/default_mobile/images/icons-36-black.png) | bin | 3611 -> 3611 bytes | |||
-rw-r--r-- | module/web/static/css/mobile/images/icons-36-white.png (renamed from module/web/static/css/default_mobile/images/icons-36-white.png) | bin | 3648 -> 3648 bytes | |||
-rw-r--r-- | module/web/static/css/mobile/jquery.mobile-1.1.1.min.css (renamed from module/web/static/css/default_mobile/jquery.mobile-1.1.1.min.css) | 0 | ||||
-rw-r--r-- | module/web/static/css/mobile/my.css (renamed from module/web/static/css/default_mobile/my.css) | 0 | ||||
-rw-r--r-- | module/web/static/img/default_mobile/fancy_deboss.png | bin | 265 -> 0 bytes | |||
-rw-r--r-- | module/web/static/js/libs/jquery.mobile-1.1.1.min.js (renamed from module/web/static/js/default_mobile/jquery.mobile-1.1.1.min.js) | 0 | ||||
-rw-r--r-- | module/web/static/js/mobile/my.js (renamed from module/web/static/js/default_mobile/my.js) | 0 | ||||
-rw-r--r-- | module/web/templates/default/base.html | 2 | ||||
-rw-r--r-- | module/web/templates/mobile/base.html (renamed from module/web/templates/default_mobile/base.html) | 10 | ||||
-rw-r--r-- | module/web/templates/mobile/login.html (renamed from module/web/templates/default_mobile/login.html) | 0 |
16 files changed, 9 insertions, 6 deletions
diff --git a/module/utils/fs.py b/module/utils/fs.py index 631b25002..9b9eb9040 100644 --- a/module/utils/fs.py +++ b/module/utils/fs.py @@ -38,6 +38,7 @@ def exists(path): def makedirs(path, mode=0755): return os.makedirs(fs_encode(path), mode) +# fs_decode? def listdir(path): return os.listdir(fs_encode(path)) diff --git a/module/web/api_app.py b/module/web/api_app.py index 4be6e5ab8..b2d7fa5b6 100644 --- a/module/web/api_app.py +++ b/module/web/api_app.py @@ -61,6 +61,7 @@ def call_api(func, args=""): print_exc() return HTTPError(500, json.dumps({"error": e.message, "traceback": format_exc()})) +# Better error codes on invalid input def callApi(func, *args, **kwargs): if not hasattr(PYLOAD.EXTERNAL, func) or func.startswith("_"): @@ -102,6 +103,7 @@ def login(): @route("/api/logout") +@route("/api/logout", method="POST") def logout(): add_header(response) diff --git a/module/web/static/css/default_mobile/images/ajax-loader.gif b/module/web/static/css/mobile/images/ajax-loader.gif Binary files differindex fd1a189c2..fd1a189c2 100644 --- a/module/web/static/css/default_mobile/images/ajax-loader.gif +++ b/module/web/static/css/mobile/images/ajax-loader.gif diff --git a/module/web/static/css/default_mobile/images/ajax-loader.png b/module/web/static/css/mobile/images/ajax-loader.png Binary files differindex 13b208ddd..13b208ddd 100644 --- a/module/web/static/css/default_mobile/images/ajax-loader.png +++ b/module/web/static/css/mobile/images/ajax-loader.png diff --git a/module/web/static/css/default_mobile/images/icons-18-black.png b/module/web/static/css/mobile/images/icons-18-black.png Binary files differindex ce1b758ad..ce1b758ad 100644 --- a/module/web/static/css/default_mobile/images/icons-18-black.png +++ b/module/web/static/css/mobile/images/icons-18-black.png diff --git a/module/web/static/css/default_mobile/images/icons-18-white.png b/module/web/static/css/mobile/images/icons-18-white.png Binary files differindex 1ab012723..1ab012723 100644 --- a/module/web/static/css/default_mobile/images/icons-18-white.png +++ b/module/web/static/css/mobile/images/icons-18-white.png diff --git a/module/web/static/css/default_mobile/images/icons-36-black.png b/module/web/static/css/mobile/images/icons-36-black.png Binary files differindex 1a59d7c37..1a59d7c37 100644 --- a/module/web/static/css/default_mobile/images/icons-36-black.png +++ b/module/web/static/css/mobile/images/icons-36-black.png diff --git a/module/web/static/css/default_mobile/images/icons-36-white.png b/module/web/static/css/mobile/images/icons-36-white.png Binary files differindex 5647bdc94..5647bdc94 100644 --- a/module/web/static/css/default_mobile/images/icons-36-white.png +++ b/module/web/static/css/mobile/images/icons-36-white.png diff --git a/module/web/static/css/default_mobile/jquery.mobile-1.1.1.min.css b/module/web/static/css/mobile/jquery.mobile-1.1.1.min.css index 3bbf55c66..3bbf55c66 100644 --- a/module/web/static/css/default_mobile/jquery.mobile-1.1.1.min.css +++ b/module/web/static/css/mobile/jquery.mobile-1.1.1.min.css diff --git a/module/web/static/css/default_mobile/my.css b/module/web/static/css/mobile/my.css index 2e73c1f35..2e73c1f35 100644 --- a/module/web/static/css/default_mobile/my.css +++ b/module/web/static/css/mobile/my.css diff --git a/module/web/static/img/default_mobile/fancy_deboss.png b/module/web/static/img/default_mobile/fancy_deboss.png Binary files differdeleted file mode 100644 index 926a762db..000000000 --- a/module/web/static/img/default_mobile/fancy_deboss.png +++ /dev/null diff --git a/module/web/static/js/default_mobile/jquery.mobile-1.1.1.min.js b/module/web/static/js/libs/jquery.mobile-1.1.1.min.js index 70f71928f..70f71928f 100644 --- a/module/web/static/js/default_mobile/jquery.mobile-1.1.1.min.js +++ b/module/web/static/js/libs/jquery.mobile-1.1.1.min.js diff --git a/module/web/static/js/default_mobile/my.js b/module/web/static/js/mobile/my.js index 41203e6c5..41203e6c5 100644 --- a/module/web/static/js/default_mobile/my.js +++ b/module/web/static/js/mobile/my.js diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index d5d96eef3..e3c216390 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -202,7 +202,7 @@ }},
style:{
classes:'ui-tooltip-light ui-tooltip-shadow',
- width: $("#notification_div").outerWidth(),
+ width: $("#globalprogress").outerWidth(),
height: 100
},
hide: false
diff --git a/module/web/templates/default_mobile/base.html b/module/web/templates/mobile/base.html index d2fec8f2e..342a7eb63 100644 --- a/module/web/templates/default_mobile/base.html +++ b/module/web/templates/mobile/base.html @@ -4,11 +4,11 @@ <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1" /> <title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title> - <link href="static/css/default_mobile/my.css" rel="stylesheet" type="text/css"/> - <link href="static/css/default_mobile/jquery.mobile-1.1.1.min.css" rel="stylesheet" type="text/css"/> + <link href="static/css/mobile/my.css" rel="stylesheet" type="text/css"/> + <link href="static/css/mobile/jquery.mobile-1.1.1.min.css" rel="stylesheet" type="text/css"/> <script type="text/javascript" src="static/js/libs/jquery-1.8.0.min.js"></script> - <script type="text/javascript" src="static/js/default_mobile/jquery.mobile-1.1.1.min.js"></script> - <script type="text/javascript" src="static/js/default_mobile/my.js"></script> + <script type="text/javascript" src="static/js/libs/jquery.mobile-1.1.1.min.js"></script> + <script type="text/javascript" src="static/js/mobile/my.js"></script> {% block head %} {% endblock %} </head> @@ -16,7 +16,7 @@ {% block content %} <!-- home --> -<div data-role="page" id="page1" style="background: url('/static/img/default_mobile/fancy_deboss.png') repeat"> +<div data-role="page" id="page1" style="background: url('/static/img/default/fancy_deboss.png') repeat"> <div data-role="content" style="padding: 1%"> <div data-role="navbar" data-iconpos="bottom"> <ul> diff --git a/module/web/templates/default_mobile/login.html b/module/web/templates/mobile/login.html index 37698cc5c..37698cc5c 100644 --- a/module/web/templates/default_mobile/login.html +++ b/module/web/templates/mobile/login.html |