diff --git a/web/fonts/glyphicons-halflings-regular.eot b/web/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 000000000..b93a4953f Binary files /dev/null and b/web/fonts/glyphicons-halflings-regular.eot differ diff --git a/web/fonts/glyphicons-halflings-regular.svg b/web/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 000000000..94fb5490a --- /dev/null +++ b/web/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/fonts/glyphicons-halflings-regular.ttf b/web/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 000000000..1413fc609 Binary files /dev/null and b/web/fonts/glyphicons-halflings-regular.ttf differ diff --git a/web/fonts/glyphicons-halflings-regular.woff b/web/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 000000000..9e612858f Binary files /dev/null and b/web/fonts/glyphicons-halflings-regular.woff differ diff --git a/web/fonts/glyphicons-halflings-regular.woff2 b/web/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 000000000..64539b54c Binary files /dev/null and b/web/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/web/skins/classic/css/classic/views/login.css b/web/skins/classic/css/classic/views/login.css index 501ec5cd1..e94435ffa 100644 --- a/web/skins/classic/css/classic/views/login.css +++ b/web/skins/classic/css/classic/views/login.css @@ -20,13 +20,22 @@ input[type="submit"] { form { max-width: 450px; - padding: 40px 60px; margin: 15px auto; border: 1px solid #e7e7e7; background-color: #fff; box-shadow: 0 0 6px 0 rgba(0,0,0,0.08); } +form .alarm { + font-size:180%; + padding:20px; + border-bottom: 1px solid #e7e7e7; +} + +#loginform { + padding: 40px 60px; +} + .form-control { height: 54px; } diff --git a/web/skins/classic/views/js/login.js b/web/skins/classic/views/js/login.js index 70894cad3..db0a47773 100644 --- a/web/skins/classic/views/js/login.js +++ b/web/skins/classic/views/js/login.js @@ -1 +1,5 @@ -window.addEvent( 'domready', function() { $('loginForm').elements['username'].focus() } ); +window.addEvent( 'domready', function() { + if ( failed == true ) { + $('loginError').removeClass( 'hidden' ); + } +} ); diff --git a/web/skins/classic/views/js/login.js.php b/web/skins/classic/views/js/login.js.php new file mode 100644 index 000000000..3ed3a92d9 --- /dev/null +++ b/web/skins/classic/views/js/login.js.php @@ -0,0 +1 @@ +var failed = ; diff --git a/web/skins/classic/views/login.php b/web/skins/classic/views/login.php index bc0c3444d..cf857bb8c 100644 --- a/web/skins/classic/views/login.php +++ b/web/skins/classic/views/login.php @@ -8,24 +8,33 @@ xhtmlHeaders(__FILE__, translate('Login') ); -

+ - - +
- - +

ZoneMinder

+ + + + + + + +
"; + } ?> + + - "; - } ?> - - +