merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint
This commit is contained in:
parent
fa77c80a91
commit
a82411b2f0
13 changed files with 256 additions and 27 deletions
|
@ -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>
|
||||
|
|
|
@ -10,19 +10,9 @@ ${scripts.add("/js/imageUpload/imageUploadUtils.js")}
|
|||
${stylesheets.addFromTheme("/uploadImages.css")}
|
||||
|
||||
|
||||
<noscript>
|
||||
<div id="javascriptDisableWrapper">
|
||||
<div id="javascriptDisableContent">
|
||||
<img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
|
||||
<p>In order to upload or edit a photo, you'll need to enable JavaScript.</p>
|
||||
</div>
|
||||
</div>
|
||||
</noscript>
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="photoUploadContainer" class="hidden">
|
||||
<div id="photoUploadContainer">
|
||||
<h2>Photo Upload</h2>
|
||||
|
||||
|
||||
|
@ -42,8 +32,10 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
|
|||
|
||||
<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"> or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
|
||||
<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>
|
||||
|
|
|
@ -27,7 +27,9 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
|
|||
<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"> or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
|
||||
<input type="submit" value="Upload photo">
|
||||
<span class="or"> or
|
||||
<a class="cancelUpload" href="${cancelUrl}">Cancel</a></span>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<#-- Log in template for accessing site admin -->
|
||||
|
||||
|
||||
<div id="formLogin" class="pageBodyGroup">
|
||||
<div id="formLogin">
|
||||
<h2>Create Your New Password</h2>
|
||||
|
||||
<#if errorMessage??>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
</div>
|
||||
</noscript>
|
||||
|
||||
<div id="formLogin" class="pageBodyGroup hidden" >
|
||||
<div id="formLogin" class="hidden" >
|
||||
|
||||
<h2>Log in</h2>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue