NIHVIVO-1176. Removed themeStylesheetDir from template model, and replaced with themeDir. Also modified stylesheet and script addFromTheme methods so the prepend only the theme directory; the specific stylesheet or css directory must be added to the path argument.
This commit is contained in:
rjy7
parent
535691ee11
commit
5bc5c0b93c
12 changed files with 80 additions and 108 deletions
|
|
@ -7,7 +7,7 @@ ${scripts.add("/js/jquery_plugins/jcrop/jquery.Jcrop.js")}
|
|||
${scripts.add("/js/imageUpload/cropImage.js")}
|
||||
|
||||
|
||||
${stylesheets.addFromTheme("/uploadImages.css")}
|
||||
${stylesheets.addFromTheme("/css/uploadImages.css")}
|
||||
${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
|
||||
|
||||
|
||||
|
|
@ -21,34 +21,35 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
|
|||
width="500" height="${(500*imageHeight)/imageWidth}"
|
||||
</#if>
|
||||
</#macro>-->
|
||||
|
||||
|
||||
|
||||
<div id="photoCroppingContainer">
|
||||
<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">
|
||||
<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">
|
||||
|
||||
<!-- Javascript will populate these values -->
|
||||
<input type="hidden" name="x" value="" />
|
||||
<input type="hidden" name="y" value="" />
|
||||
<input type="hidden" name="w" value="" />
|
||||
<input type="hidden" name="h" value="" />
|
||||
<!-- Javascript will populate these values -->
|
||||
<input type="hidden" name="x" value="" />
|
||||
<input type="hidden" name="y" value="" />
|
||||
<input type="hidden" name="w" value="" />
|
||||
<input type="hidden" name="h" value="" />
|
||||
|
||||
<input type="submit" value="Save photo">
|
||||
or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div id="photoCropping">
|
||||
|
||||
<img style="border:1px solid green;" src="${imageUrl}" <#--<@newImageSize/>--> id="cropbox" />
|
||||
|
||||
<input type="submit" value="Save photo">
|
||||
or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="photoCropping">
|
||||
<img style="border:1px solid green;" src="${imageUrl}" <#--<@newImageSize/>--> id="cropbox" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
|
|
|||
|
|
@ -5,38 +5,30 @@
|
|||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
||||
|
||||
|
||||
|
||||
${stylesheets.addFromTheme("/uploadImages.css")}
|
||||
|
||||
|
||||
|
||||
${stylesheets.addFromTheme("/css/uploadImages.css")}
|
||||
|
||||
<div id="photoUploadContainer">
|
||||
<h2>Photo Upload</h2>
|
||||
|
||||
|
||||
<#if errorMessage??>
|
||||
<div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
|
||||
<p>${errorMessage}</p>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
|
||||
|
||||
<div id="photoUploadDefaultImageContainer">
|
||||
<h6>Current Photo</h6>
|
||||
<img src="${thumbnailUrl}" width="115" height="115" /> </div>
|
||||
<h2>Photo Upload</h2>
|
||||
|
||||
<div id="photoUploadForm">
|
||||
|
||||
<form action="${formAction}" enctype="multipart/form-data" method="post">
|
||||
<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>
|
||||
<#if errorMessage??>
|
||||
<div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
|
||||
<p>${errorMessage}</p>
|
||||
</div>
|
||||
</#if>
|
||||
|
||||
<div id="photoUploadDefaultImageContainer">
|
||||
<h6>Current Photo</h6>
|
||||
<img src="${thumbnailUrl}" width="115" height="115" />
|
||||
</div>
|
||||
|
||||
<div id="photoUploadForm">
|
||||
<form action="${formAction}" enctype="multipart/form-data" method="post">
|
||||
<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>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,32 +5,28 @@
|
|||
${scripts.add("/js/jquery.js")}
|
||||
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
||||
|
||||
|
||||
|
||||
${stylesheets.addFromTheme("/uploadImages.css")}
|
||||
|
||||
|
||||
${stylesheets.addFromTheme("/css/uploadImages.css")}
|
||||
|
||||
<div id="photoUploadContainer">
|
||||
<h2>Photo Upload</h2>
|
||||
<#if errorMessage??>
|
||||
<div id="errorAlert"><img src="${urls.siteIcons}/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>
|
||||
<h2>Photo Upload</h2>
|
||||
<#if errorMessage??>
|
||||
<div id="errorAlert"><img src="${urls.siteIcons}/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">
|
||||
<form action="${formAction}" enctype="multipart/form-data" method="post">
|
||||
<label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
|
||||
<input 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 id="photoUploadForm">
|
||||
<form action="${formAction}" enctype="multipart/form-data" method="post">
|
||||
<label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
|
||||
<input 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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue