litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-22 18:47:44 +00:00
parent fa77c80a91
commit a82411b2f0
13 changed files with 256 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
View file

@ -16,11 +16,11 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
the script below will reduce the width to 500 pixels and
the height will be in proportion to the new height-->
<#macro newImageSize>
<#--<#macro newImageSize>
<#if (imageWidth >= 500)>
width="500" height="${(500*imageHeight)/imageWidth}"
</#if>
</#macro>
</#macro>-->
<div id="photoCroppingContainer">
@ -47,7 +47,7 @@ ${stylesheets.add("/js/jquery_plugins/jcrop/jquery.Jcrop.css")}
</div>
<div id="photoCropping">
<img style="border:1px solid green;" src="${imageUrl}" <@newImageSize/> id="cropbox" />
<img style="border:1px solid green;" src="${imageUrl}" <#--<@newImageSize/>--> id="cropbox" />
</div>
</div>