diff --git a/server/src/uds/core/util/OsDetector.py b/server/src/uds/core/util/OsDetector.py index 3105a8862..c1983b6c6 100644 --- a/server/src/uds/core/util/OsDetector.py +++ b/server/src/uds/core/util/OsDetector.py @@ -38,9 +38,10 @@ logger = logging.getLogger(__name__) Linux = 'Linux' Windows = 'Windows' Macintosh = 'Macintosh' +Android = 'Android' -knownOss = { 'Linux' : Linux, 'Windows' : Windows, 'Macintosh' : Macintosh } +knownOss = { 'Linux' : Linux, 'Windows' : Windows, 'Macintosh' : Macintosh, 'Android': Android } def getOsFromUA(ua): ''' @@ -54,6 +55,7 @@ def getOsFromUA(ua): break except Exception: pass - logger.debug(res) + logger.debug('User-Agent: {0}'.format(ua)) + logger.debug('Detected OS: {0}'.format(res)) return res \ No newline at end of file diff --git a/server/src/uds/static/css/uds-html5.css b/server/src/uds/static/css/uds-html5.css index 98990ecc9..64e6440d0 100644 --- a/server/src/uds/static/css/uds-html5.css +++ b/server/src/uds/static/css/uds-html5.css @@ -1,9 +1,12 @@ @CHARSET "UTF-8"; +html, body { + height: 100%; +} + body { padding-top: 60px; padding-bottom: 40px; - background-color: #ffffff; } @media (max-width: 979px) { @@ -14,6 +17,7 @@ body { footer { + display: none; padding:1.6% 2%; margin-top:4em; text-align:right; @@ -85,13 +89,9 @@ footer { } .profile-img { - font-size: 96px; width: 96px; height: 96px; margin: 0 auto 10px; display: block; - -moz-border-radius: 50%; - -webkit-border-radius: 50%; - border-radius: 50%; } diff --git a/server/src/uds/static/img/login-img.png b/server/src/uds/static/img/login-img.png index 7de052010..f57a78277 100644 Binary files a/server/src/uds/static/img/login-img.png and b/server/src/uds/static/img/login-img.png differ diff --git a/server/src/uds/templates/uds/html5/index.html b/server/src/uds/templates/uds/html5/index.html index fce20567d..b32345653 100644 --- a/server/src/uds/templates/uds/html5/index.html +++ b/server/src/uds/templates/uds/html5/index.html @@ -1,33 +1,35 @@ {% extends "uds/html5/internal_page.html" %} {% load i18n static html5 %} + +{% block css %} + +{% endblock %} + {% block js %}