diff options
| -rw-r--r-- | photoblaster/modules/pbconcat/__init__.py | 4 | ||||
| -rw-r--r-- | photoblaster/server.py | 2 | ||||
| -rw-r--r-- | share/frontend/imconcat/index.html | 19 |
3 files changed, 13 insertions, 12 deletions
diff --git a/photoblaster/modules/pbconcat/__init__.py b/photoblaster/modules/pbconcat/__init__.py index 33d1cb5..68ebc6d 100644 --- a/photoblaster/modules/pbconcat/__init__.py +++ b/photoblaster/modules/pbconcat/__init__.py @@ -224,12 +224,8 @@ class PbConcat(ModuleBase): ) def create(self): - import sys - sys.stderr.write("in create function\n") self._match_dimensions() - sys.stderr.write("done matching dimensions\n") self._make_frames_count_equal() - sys.stderr.write("done making frames equal\n") self._merge_frames() self._finalize_image() diff --git a/photoblaster/server.py b/photoblaster/server.py index 802d8b1..e7ebcee 100644 --- a/photoblaster/server.py +++ b/photoblaster/server.py @@ -91,7 +91,6 @@ class Server(object): @self.app.route('/im/proxy', methods=['GET']) def p_image(): - sys.stderr.write("got request") url = request.args.get("url") req = urllib2.Request(url=url) req = urllib2.urlopen(req) @@ -217,7 +216,6 @@ class Server(object): return send_from_directory(WORKING_DIR, path) def _find_class_by_name(self, pb_classname): - sys.stderr.write("looking for %s\n" % pb_classname) pb_classname = self._classname_aliases.get(pb_classname, None) or \ pb_classname try: 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(){ |