fixed login screen after bootstrap upgrade

5 files changed, 21 insertions, 8 deletions

diff --git a/www/img/helsinki-small.png b/www/img/helsinki-small.png
new file mode 100644
index 0000000..05161fb
--- /dev/null
+++ b/www/img/helsinki-small.png
diff --git a/www/index.html b/www/index.html
index 706a190..5b5800d 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,7 +8,7 @@
   <meta name="author" content="Christian Pointner <equinox@helsinki.at>, Peter Grassberger <petertheone@gmail.com>">
 
   <link rel="shortcut icon" href="/img/favicon.ico" />
-  <link href="/javascript/bootstrap/css/bootstrap.css" rel="stylesheet">
+  <link href="/javascript/bootstrap/css/bootstrap.min.css" rel="stylesheet">
   <link href="/styles/main-style.css" rel="stylesheet">
   <link href="/styles/auth.css" rel="stylesheet">
   <link href="/styles/shows.css" rel="stylesheet">
@@ -37,12 +37,15 @@
     <div id="loginbox">
 
       <form id="loginform" class="form-auth" role="form">
-        <img src="/img/helsinki.png" alt="radio helsinki logo" />
+        <img class="visible-xs-block" src="img/helsinki-small.png" alt="radio helsinki logo" />
+        <div class="loginspacer hidden-xs">&nbsp;</div>
+        <div class="loginspacer hidden-xs hidden-sm">&nbsp;</div>
+        <img class="hidden-xs" src="img/helsinki.png" alt="radio helsinki logo" />
         <h1 class="form-auth-heading">Radio Helsinki - Import</h1>
         <input id="username" type="text" class="form-control" placeholder="Benutzername" required autofocus>
         <input id="password" type="password" class="form-control" placeholder="Passwort" required>
         <div class="alertbox"></div>
-        <button class="btn btn-primary btn-lg" type="submit"><i class="icon-user icon-white"></i> Anmelden</button>
+        <button class="btn btn-primary btn-lg" type="submit"><span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>&nbsp;&nbsp;Anmelden</button>
       </form>
 
     </div>
diff --git a/www/js/utils.js b/www/js/utils.js
index b8bfee7..1359b39 100644
--- a/www/js/utils.js
+++ b/www/js/utils.js
@@ -26,14 +26,17 @@ var Rivendell = Rivendell || {};
 
 var alertbox = function() {}
 alertbox.warning = function (dest, heading, message) {
-  $('#' + dest + ' .alertbox').html('<div class="alert"><a class="close" data-dismiss="alert" href="#">&times;</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>');
+  $('#' + dest + ' .alertbox').html('<div class="alert alert-warning"><a class="close" data-dismiss="alert" href="#">&times;</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>');
 }
 alertbox.error = function (dest, heading, message) {
-  $('#' + dest + ' .alertbox').html('<div class="alert alert-error"><a class="close" data-dismiss="alert" href="#">&times;</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>');
+  $('#' + dest + ' .alertbox').html('<div class="alert alert-danger"><a class="close" data-dismiss="alert" href="#">&times;</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>');
 }
 alertbox.info = function (dest, heading, message) {
   $('#' + dest + ' .alertbox').html('<div class="alert alert-info"><a class="close" data-dismiss="alert" href="#">&times;</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>');
 }
+alertbox.success = function (dest, heading, message) {
+  $('#' + dest + ' .alertbox').html('<div class="alert alert-success"><a class="close" data-dismiss="alert" href="#">&times;</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>');
+}
 
 Number.prototype.pad = function(size) {
   var s = String(this);
diff --git a/www/styles/auth.css b/www/styles/auth.css
index eaf4233..80af96c 100644
--- a/www/styles/auth.css
+++ b/www/styles/auth.css
@@ -20,8 +20,13 @@
  *  along with rhwebimport. If not, see <http://www.gnu.org/licenses/>.
  */
 
+
+.loginspacer {
+    padding-top: 30px;
+}
+
 .form-auth {
-  max-width: 330px;
+  max-width: 400px;
   padding: 15px;
   margin: 0 auto;
 }
diff --git a/www/styles/main-style.css b/www/styles/main-style.css
index 443d68e..319fb37 100644
--- a/www/styles/main-style.css
+++ b/www/styles/main-style.css
@@ -22,8 +22,10 @@
 
 body {
     background-color: #eee;
-    padding-top: 60px;
-    padding-bottom: 40px;
+}
+
+#mainwindow {
+    padding-top: 70px;
 }
 
 .container.fullWidth {