diff --git a/webapp/web/js/imageUpload/cropImage.js b/webapp/web/js/imageUpload/cropImage.js index 43317c5a2..d3f3d315c 100644 --- a/webapp/web/js/imageUpload/cropImage.js +++ b/webapp/web/js/imageUpload/cropImage.js @@ -28,12 +28,16 @@ } }; - $('#submitPhoto').click(function() { + function removeAlpha(str) { + return str.replace(/[^\d-]/g,''); + }; + + $('#cropImage').submit(function() { var preview = $('#preview'); - $('input[name=x]').val(preview.css('marginLeft').replace(/[^\d-]/g,'')); - $('input[name=y]').val(preview.css('marginTop').replace(/[^\d-]/g,'')); - $('input[name=w]').val(preview.css('width').replace(/[^\d-]/g,'')); - $('input[name=h]').val(preview.css('height').replace(/[^\d-]/g,'')); + $('input[name=x]').val(removeAlpha(preview.css('marginLeft'))); + $('input[name=y]').val(removeAlpha(preview.css('marginTop'))); + $('input[name=w]').val(removeAlpha(preview.css('width'))); + $('input[name=h]').val(removeAlpha(preview.css('height'))); }); }); diff --git a/webapp/web/templates/freemarker/body/imageUpload/cropImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/cropImage.ftl index 0103a7dc1..00f380242 100644 --- a/webapp/web/templates/freemarker/body/imageUpload/cropImage.ftl +++ b/webapp/web/templates/freemarker/body/imageUpload/cropImage.ftl @@ -18,8 +18,14 @@ ${stylesheets.addFromTheme("/jquery.Jcrop.css")}

To make adjustments, you can drag around and resize the blue square to the right. When you are happy with your photo click the "Save Photo" button.

-
+ + + + + + + or Cancel
diff --git a/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl index 22afb2cf7..596faa325 100644 --- a/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl +++ b/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl @@ -16,9 +16,9 @@ ${stylesheets.addFromTheme("/uploadImages.css")} Delete photo
- + - or Cancel + or Cancel
\ No newline at end of file