diff --git a/webapp/web/css/uploadImages.css b/webapp/web/css/uploadImages.css new file mode 100644 index 000000000..54188aa8a --- /dev/null +++ b/webapp/web/css/uploadImages.css @@ -0,0 +1,94 @@ +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +/* <------ UPLOAD PICTURE*/ +#photoUpload{ + margin-left: 0px; + height: 280px; + background: #fff; + padding: 15px; +} +#photoUploadDefaultImage{ + width: 120px; + float: left; +} +#photoUploadDefaultImage img{ + margin-bottom: 10px; +} +#photoUploadForm{ + width: 280px; + float: left; + padding-left: 15px; + margin-left: 1.2em; + margin-top: 30px; + padding-top: 15px; + padding-bottom: 25px; +} +#photoUploadForm label{ + display: block; + padding-bottom: 10px; +} +#photoUploadForm label span{ + font-size: 0.7em; +} +#photoUploadForm input{ + margin-bottom: 10px; +} +/* <------ CROP PICTURE*/ +#photoCropping{ + margin-left: 0px; + height: 450px; + background: #fff; + padding: 15px 0 15px 15px; + margin-right: 0; +} +#photoCroppingPreview{ + width: 180px; + float: left; +} +.photoCroppingNote{ + margin-top: 15px; + font-size: 0.8em; +} +#photoCropping{ + width: 400px; + float: left; + padding-top: 30px; + padding-left: 15px; + margin-left: 0; + margin-right: 0; +} +.photoCroppedPreview{ + width: 115px; + height: 115px; + overflow: hidden; +} +/* <------ DELETE PICTURE*/ +#photoDeletingContainer{ + margin-left: 0px; + width: 720px; + height: 330px; + background: #fff; + padding: 15px; +} +/* <------ ERROR ALERTS*/ +#error-alert{ + color: #900; + padding: 0px; + margin-bottom: 5px; + height: 30px; +} +#error-alert img{ + float: left; + margin: 0; + padding: 0; + vertical-align: middle; +} +#error-alert p{ + padding-left: 35px; + font-size: 0.9em; + line-height: 30px; +} +.or{ + display: inline; + vertical-align: middle; +} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl index 98c4d2cd0..aa6599b69 100644 --- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl +++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl @@ -7,7 +7,7 @@ ${scripts.add("/js/jquery_plugins/jcrop/jquery.Jcrop.js")} ${scripts.add("/js/imageUpload/cropImage.js")} -${stylesheets.addFromTheme("/css/uploadImages.css")} +${stylesheets.add("/css/uploadImages.css")} ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")} @@ -23,33 +23,39 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")} #macro>--> -
Your profile photo will look like the image below.
- -To make adjustments, you can drag around and resize the photo to the right. When you are happy with your photo click the "Save Photo" button.
- -Your profile photo will look like the image below.
+ +To make adjustments, you can drag around and resize the photo to the right. When you are happy with your photo click the "Save Photo" button.
+ + +${errorMessage}
-${errorMessage}
-