NIHVIVO-1574: Refactored upload image templates, and made upload images css file theme agnostic.
This commit is contained in:
mb863
parent
f62171fa59
commit
3b95c44b39
4 changed files with 168 additions and 67 deletions
94
webapp/web/css/uploadImages.css
Normal file
94
webapp/web/css/uploadImages.css
Normal file
|
|
@ -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;
|
||||||
|
}
|
||||||
|
|
@ -7,7 +7,7 @@ ${scripts.add("/js/jquery_plugins/jcrop/jquery.Jcrop.js")}
|
||||||
${scripts.add("/js/imageUpload/cropImage.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")}
|
${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -23,33 +23,39 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
|
||||||
</#macro>-->
|
</#macro>-->
|
||||||
|
|
||||||
|
|
||||||
<div id="photoCroppingContainer">
|
<section id="photoCroppingContainer" role="region">
|
||||||
<h2>Photo Upload</h2>
|
<h2>Photo Upload</h2>
|
||||||
<!-- This is the image we're attaching Jcrop to -->
|
|
||||||
<div id="photoCroppingPreview">
|
|
||||||
<h6>Current Photo </h6>
|
|
||||||
<p class="photoCroppingTitleBody">Your profile photo will look like the image below. </p>
|
|
||||||
<div style="width:115px;height:115px;overflow:hidden;border:1px solid green;">
|
|
||||||
<img src="${imageUrl}" id="preview" />
|
|
||||||
</div>
|
|
||||||
<div id="photoCroppingHowTo">
|
|
||||||
<p class="photoCroppingNote">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. </p>
|
|
||||||
<form id="cropImage" action="${formAction}" method="post">
|
|
||||||
|
|
||||||
|
<!-- This is the image we're attaching Jcrop to -->
|
||||||
|
<section id="photoCroppingPreview" role="region">
|
||||||
|
<h3>Current Photo</h3>
|
||||||
|
|
||||||
|
<p class="photoCroppingTitleBody">Your profile photo will look like the image below. </p>
|
||||||
|
|
||||||
|
<section class="photoCroppedPreview" role="region">
|
||||||
|
<img src="${imageUrl}" id="preview" alt="Image to be cropped"/>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="photoCroppingHowTo" role="region">
|
||||||
|
<p class="photoCroppingNote">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. </p>
|
||||||
|
|
||||||
|
<form id="cropImage" action="${formAction}" method="post" role="form">
|
||||||
<!-- Javascript will populate these values -->
|
<!-- Javascript will populate these values -->
|
||||||
<input type="hidden" name="x" value="" />
|
<input type="hidden" name="x" value="" />
|
||||||
<input type="hidden" name="y" value="" />
|
<input type="hidden" name="y" value="" />
|
||||||
<input type="hidden" name="w" value="" />
|
<input type="hidden" name="w" value="" />
|
||||||
<input type="hidden" name="h" value="" />
|
<input type="hidden" name="h" value="" />
|
||||||
|
|
||||||
<input type="submit" value="Save photo">
|
<input id="submit" type="submit" value="Save photo">
|
||||||
or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
|
|
||||||
</form>
|
<span class="or"> or <a class="cancel" href="${cancelUrl}">Cancel</a></span>
|
||||||
</div>
|
</form>
|
||||||
</div>
|
</section>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="photoCropping" role="region">
|
||||||
|
<img src="${imageUrl}" id="cropbox" alt="Preview of photo cropped" />
|
||||||
|
</section
|
||||||
|
</section>
|
||||||
|
|
||||||
<div id="photoCropping">
|
|
||||||
<img style="border:1px solid green;" src="${imageUrl}" <#--<@newImageSize/>--> id="cropbox" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
|
|
|
||||||
|
|
@ -5,30 +5,29 @@
|
||||||
${scripts.add("/js/jquery.js")}
|
${scripts.add("/js/jquery.js")}
|
||||||
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
||||||
|
|
||||||
${stylesheets.addFromTheme("/css/uploadImages.css")}
|
${stylesheets.add("/css/uploadImages.css")}
|
||||||
|
|
||||||
<div id="photoUploadContainer">
|
<section id="photoUploadContainer" role="region">
|
||||||
<h2>Photo Upload</h2>
|
<h2>Photo Upload</h2>
|
||||||
|
|
||||||
<#if errorMessage??>
|
<#if errorMessage??>
|
||||||
<div id="error-alert"><img src="${urls.images}/iconAlert.png"/>
|
<section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="Error alert icon" />
|
||||||
<p>${errorMessage}</p>
|
<p>${errorMessage}</p>
|
||||||
</div>
|
</section>
|
||||||
</#if>
|
</#if>
|
||||||
|
|
||||||
<div id="photoUploadDefaultImageContainer">
|
<section id="photoUploadDefaultImage" role="region">
|
||||||
<h6>Current Photo</h6>
|
<h3>Current Photo</h3>
|
||||||
<img src="${thumbnailUrl}" width="115" height="115" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="photoUploadForm">
|
<img src="${thumbnailUrl}" width="115" height="115" alt="Individual photo" />
|
||||||
<form action="${formAction}" enctype="multipart/form-data" method="post">
|
</section>
|
||||||
|
|
||||||
|
<form id="photoUploadForm" action="${formAction}" enctype="multipart/form-data" method="post" role="form">
|
||||||
<label>Upload a photo <span> (JPEG, GIF or PNG)</span></label>
|
<label>Upload a photo <span> (JPEG, GIF or PNG)</span></label>
|
||||||
<input id="datafile" type="file" name="datafile" size="30" />
|
|
||||||
<input type="submit" value="Upload photo"/>
|
|
||||||
<span class="or"> or
|
|
||||||
<a class="cancelUpload" href="${cancelUrl}">Cancel</a></span>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
<input id="datafile" type="file" name="datafile" size="30" />
|
||||||
|
<input id="submit" type="submit" value="Upload photo"/>
|
||||||
|
|
||||||
|
<span class="or"> or <a class="cancel" href="${cancelUrl}">Cancel</a></span>
|
||||||
|
</form>
|
||||||
|
</section>
|
||||||
|
|
@ -5,28 +5,30 @@
|
||||||
${scripts.add("/js/jquery.js")}
|
${scripts.add("/js/jquery.js")}
|
||||||
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
||||||
|
|
||||||
${stylesheets.addFromTheme("/css/uploadImages.css")}
|
${stylesheets.add("/css/uploadImages.css")}
|
||||||
|
|
||||||
<div id="photoUploadContainer">
|
<section id="photoUpload" role="region">
|
||||||
<h2>Photo Upload</h2>
|
<h2>Photo Upload</h2>
|
||||||
<#if errorMessage??>
|
|
||||||
<div id="error-alert"><img src="${urls.images}/iconAlert.png"/>
|
|
||||||
<p>${errorMessage}</p>
|
|
||||||
</div>
|
|
||||||
</#if>
|
|
||||||
<div id="photoUploadDefaultImageContainer">
|
|
||||||
<h6>Current Photo</h6>
|
|
||||||
<img src="${thumbnailUrl}" width="115" />
|
|
||||||
<a class="thumbnail" href="${deleteUrl}">Delete photo</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="photoUploadForm">
|
<#if errorMessage??>
|
||||||
<form action="${formAction}" enctype="multipart/form-data" method="post">
|
<section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="Error alert icon" />
|
||||||
|
<p>${errorMessage}</p>
|
||||||
|
</section>
|
||||||
|
</#if>
|
||||||
|
|
||||||
|
<section id="photoUploadDefaultImage" role="region">
|
||||||
|
<h3>Current Photo</h3>
|
||||||
|
<img src="${thumbnailUrl}" width="115" alt="Individual photo" />
|
||||||
|
|
||||||
|
<a class="thumbnail" href="${deleteUrl}">Delete photo</a>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<form id="photoUploadForm" action="${formAction}" enctype="multipart/form-data" method="post" role="form">
|
||||||
<label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
|
<label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
|
||||||
|
|
||||||
<input type="file" name="datafile" size="30">
|
<input type="file" name="datafile" size="30">
|
||||||
<input type="submit" value="Upload photo">
|
<input id="submit" type="submit" value="Upload photo">
|
||||||
<span class="or"> or
|
|
||||||
<a class="cancelUpload" href="${cancelUrl}">Cancel</a></span>
|
<span class="or"> or <a class="cancel" href="${cancelUrl}">Cancel</a></span>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</section>
|
||||||
</div>
|
|
||||||
Loading…
Add table
Reference in a new issue