NIHVIVO-157 manual merge of the changes from branch NIHVIVO-157-file-storage

This commit is contained in:
jeb228 2010-06-20 19:23:19 +00:00
parent 083aa4e530
commit fb7d5bbba9
51 changed files with 3535 additions and 1198 deletions

View file

@ -90,18 +90,6 @@
<input type="text" name="Timekey" value="<form:value name="Timekey"/>" size="19" maxlength="19"><br>
<font size="2" color="red"><form:error name="Timekey"/></font>
</td>
</tr>
<tr class="editformcell" id='thumbnailFilenameTr'>
<td id="thumbnailTd" valign="bottom" colspan="1">
<b>Thumbnail Filename</b> <em>Optional and usually more convenient to upload from previous screen</em>
<input type="text" name="ThumbnailFilename" value="<form:value name="ThumbnailFilename"/>" size="60" maxlength="255" />
<font size="2" color="red"><form:error name="ThumbnailFilename"/></font>
</td>
<td id="optionalImageTd" valign="bottom" colspan="1">
<b>Optional Larger Image</b> <em>(filename or full path)</em>
<input type="text" name="LargerImage" value="<form:value name="LargerImage"/>" size="60" maxlength="255" />
<font size="2" color="red"><form:error name="LargerImage"/></font>
</td>
</tr>
<tr class="editformcell" id="portalFlagsTr">
<td id="portalFlagsTd" valign="bottom" colspan="3">