diff options
Diffstat (limited to 'share/frontend')
| -rw-r--r-- | share/frontend/imconcat/index.html | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/share/frontend/imconcat/index.html b/share/frontend/imconcat/index.html index bdc676b..c851100 100644 --- a/share/frontend/imconcat/index.html +++ b/share/frontend/imconcat/index.html @@ -3,7 +3,6 @@ <head> <meta charset="utf-8" /> <title>Photoblaster Concatenate</title> -<!-- <link rel="stylesheet" style="text/css" href="deps/opt/bootstrap.css" />--> <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script> <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> @@ -87,6 +86,9 @@ background-position: 3px 10px; cursor: pointer; } + .modal-footer{ + border: none; + } </style> </head> <body> @@ -211,7 +213,6 @@ } }); function showSuccess(data){ - console.log("in show success function") $('.success').removeClass('dontshowme') $('#final_image').find('img').attr("src", data.url) $('#final_image').find('a').attr("href", data.url) @@ -236,7 +237,14 @@ case 500: msg = "Problem with the request. Please check your input parameters." break; - default: + case 400: + msg = data.responseJSON.message + reportError("hello") + break; + case 410: + msg = data.responseJSON.message + break; + default: msg = "Request was unable to reach the server. Try Again?" } reportError(msg) @@ -252,10 +260,9 @@ $('#logos').find('img').attr("src", "img/logo-complete.png") }; function reportError(msg){ - $('h4.failure').toggleClass("dontshowme") + $('.failure, #error_message').removeClass("dontshowme") $('#error_message').html(msg) - $('#error_message').toggleClass("dontshowme") - generatingOff() + $('#error_message').removeClass("dontshowme") $('.modal').modal(); } function resetModal(){ |