diff options
author | Christian Pointner <equinox@helsinki.at> | 2014-09-22 11:33:22 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2014-09-22 11:33:22 (GMT) |
commit | c6657a7f19fb97fc6b84e8b6eb37152f966e0848 (patch) | |
tree | 47a0ddfcacbb48cca09f78c2abd353d646c938cb /js | |
parent | f83ad4964258f54b67628cb3d65702d862dd3272 (diff) |
added alertbox for main window
Diffstat (limited to 'js')
-rw-r--r-- | js/auth.js | 4 | ||||
-rw-r--r-- | js/shows.js | 2 | ||||
-rw-r--r-- | js/utils.js | 12 |
3 files changed, 9 insertions, 9 deletions
@@ -15,7 +15,7 @@ function auth_loginSuccess(data) { $('#loginbox').slideUp(); $('#mainwindow').fadeIn(); } else { - alertbox.error("Fehler beim Login", data.errorstring); + alertbox.error('loginbox', "Fehler beim Login", data.errorstring); auth_cleanup(); } } @@ -25,7 +25,7 @@ function auth_loginError(req, status, error) { if(req.status == 401) { message = "Benutzer und/oder Passwort sind falsch!"; } - alertbox.error("Fehler beim Login", message); + alertbox.error('loginbox', "Fehler beim Login", message); $("#password").val(''); } diff --git a/js/shows.js b/js/shows.js index 03af34f..3d57b75 100644 --- a/js/shows.js +++ b/js/shows.js @@ -11,7 +11,7 @@ function shows_deleteCart(cart) { } function shows_importCart(cart) { - alert('importing carts is not implemented yet!'); + alertbox.warning('mainwindow', 'importing carts', 'not implemented yet!'); } // <td> diff --git a/js/utils.js b/js/utils.js index 4d7d0d6..0e76068 100644 --- a/js/utils.js +++ b/js/utils.js @@ -1,12 +1,12 @@ alertbox = function() {} -alertbox.warning = function (heading, message) { - $('#alertbox').html('<div class="alert"><a class="close" data-dismiss="alert" href="#">×</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>'); +alertbox.warning = function (dest, heading, message) { + $('#' + dest + ' .alertbox').html('<div class="alert"><a class="close" data-dismiss="alert" href="#">×</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>'); } -alertbox.error = function (heading, message) { - $('#alertbox').html('<div class="alert alert-error"><a class="close" data-dismiss="alert" href="#">×</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="#">×</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>'); } -alertbox.info = function (heading, message) { - $('#alertbox').html('<div class="alert alert-info"><a class="close" data-dismiss="alert" href="#">×</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="#">×</a><h4 class="alert-heading">' + heading + '</h4>' + message + '</div>'); } var weekday = new Array(7); |